X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=56cee1140814185072007d6acf2f2e9336b9f6dd;hp=7d2023e5c91ab266d3c94a81b9cd8f8ad5497c44;hb=37e3be3b6a61e26f9836d3575531ba716818b134;hpb=c31333cd83a4262af8e54d96311d1368b66909cc

diff --git a/dgit b/dgit
index 7d2023e5..56cee114 100755
--- a/dgit
+++ b/dgit
@@ -503,28 +503,36 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.test-dummy.upload-host' => 'test-dummy',
                );
 
-sub git_get_config ($) {
-    my ($c) = @_;
+our %gitcfg;
 
-    our %git_get_config_memo;
-    if (exists $git_get_config_memo{$c}) {
-	return $git_get_config_memo{$c};
-    }
+sub git_slurp_config () {
+    local ($debuglevel) = $debuglevel-2;
+    local $/="\0";
 
-    my $v;
-    my @cmd = (@git, qw(config --), $c);
-    {
-	local ($debuglevel) = $debuglevel-2;
-	$v = cmdoutput_errok @cmd;
-    };
-    if ($?==0) {
-    } elsif ($?==256) {
-	$v = undef;
-    } else {
-	failedcmd @cmd;
+    my @cmd = (@git, qw(config -z --get-regexp .*));
+    debugcmd "|",@cmd;
+
+    open GITS, "-|", @cmd or failedcmd @cmd;
+    while (<GITS>) {
+	chomp or die;
+	printdebug "=> ", (messagequote $_), "\n";
+	m/\n/ or die "$_ ?";
+	push @{ $gitcfg{$`} }, $'; #';
     }
-    $git_get_config_memo{$c} = $v;
-    return $v;
+    $!=0; $?=0;
+    close GITS
+	or ($!==0 && $?==256)
+	or failedcmd @cmd;
+}
+
+sub git_get_config ($) {
+    my ($c) = @_;
+    my $l = $gitcfg{$c};
+    printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
+	if $debuglevel >= 4;
+    $l or return undef;
+    @$l==1 or badcfg "multiple values for $c" if @$l > 1;
+    return $l->[0];
 }
 
 sub cfg {
@@ -3179,30 +3187,28 @@ sub finalise_opts_opts () {
 	}
 
 	foreach my $c (access_cfg_cfgs("opts-$k")) {
-	    local ($debuglevel) = $debuglevel-2;
-	    my @cmd = (@git, qw(config -z --get-all), $c);
-	    my $vs = cmdoutput_errok @cmd;
-	    if ($?==0) {
-		badcfg "cannot configure options for $k"
-		    if $opts_opt_cmdonly{$k};
-		my $insertpos = $opts_cfg_insertpos{$k};
-		@$om = ( @$om[0..$insertpos-1],
-			 (split /\0/, $vs),
-			 @$om[$insertpos..$#$om] );
-	    } elsif ($?==256) {
-		die "$k $c ?" if length $vs;
-	    } else {
-		failedcmd @cmd;
-	    }
+	    my $vl = $gitcfg{$c};
+	    printdebug "CL $c ",
+	        ($vl ? join " ", map { shellquote } @$vl : ""),
+	        "\n" if $debuglevel >= 4;
+	    next unless $vl;
+	    badcfg "cannot configure options for $k"
+		if $opts_opt_cmdonly{$k};
+	    my $insertpos = $opts_cfg_insertpos{$k};
+	    @$om = ( @$om[0..$insertpos-1],
+		     @$vl,
+		     @$om[$insertpos..$#$om] );
 	}
     }
 }
 
 if ($ENV{$fakeeditorenv}) {
+    git_slurp_config();
     quilt_fixup_editor();
 }
 
 parseopts();
+git_slurp_config();
 
 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"