From b2bdd40bf5ae556a916474702768d26c380be7d1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 9 Oct 2016 21:43:19 +0100
Subject: [PATCH] dgit: New config option slurping approach

Allows local git config options to override user-global ones, as is
proper.  Closes:#835858.

Also, we now need to handle -c options ourselves.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog |  2 ++
 dgit             | 73 ++++++++++++++++++++++++++++++------------------
 2 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5dc62587..e4f2630c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,8 @@ dgit (1.5~~) unstable; urgency=medium
   * Don't break if user has push.followTags=true.  Closes:#827878.
   * Arrange for the special dgit remote to be skipped by git fetch --all
     etc.  Closes:#827892.
+  * Allow local git config options to override user-global ones,
+    as is proper.  Closes:#835858.
 
   Test suite:
   * When sbuild fails, do not crash due to sed not finding the log
diff --git a/dgit b/dgit
index 1208b124..b695905c 100755
--- a/dgit
+++ b/dgit
@@ -600,36 +600,49 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.test-dummy.upload-host' => 'test-dummy',
                );
 
-our %gitcfg;
+our %gitcfgs;
+our @gitcfgsources = qw(cmdline local global system);
 
 sub git_slurp_config () {
     local ($debuglevel) = $debuglevel-2;
     local $/="\0";
 
-    my @cmd = (@git, qw(config -z --get-regexp .*));
-    debugcmd "|",@cmd;
-
-    open GITS, "-|", @cmd or die $!;
-    while (<GITS>) {
-	chomp or die;
-	printdebug "=> ", (messagequote $_), "\n";
-	m/\n/ or die "$_ ?";
-	push @{ $gitcfg{$`} }, $'; #';
+    # This algoritm is a bit subtle, but this is needed so that for
+    # options which we want to be single-valued, we allow the
+    # different config sources to override properly.  See #835858.
+    foreach my $src (@gitcfgsources) {
+	next if $src eq 'cmdline';
+	# we do this ourselves since git doesn't handle it
+	
+	my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
+	debugcmd "|",@cmd;
+
+	open GITS, "-|", @cmd or die $!;
+	while (<GITS>) {
+	    chomp or die;
+	    printdebug "=> ", (messagequote $_), "\n";
+	    m/\n/ or die "$_ ?";
+	    push @{ $gitcfgs{$src}{$`} }, $'; #';
+	}
+	$!=0; $?=0;
+	close GITS
+	    or ($!==0 && $?==256)
+	    or failedcmd @cmd;
     }
-    $!=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];
+    foreach my $src (@gitcfgsources) {
+	my $l = $gitcfgs{$src}{$c};
+	printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
+	    if $debuglevel >= 4;
+	$l or next;
+	@$l==1 or badcfg "multiple values for $c".
+	    " (in $src git config)" if @$l > 1;
+	return $l->[0];
+    }
+    return undef;
 }
 
 sub cfg {
@@ -5022,8 +5035,6 @@ defvalopt '--build-products-dir','','.*',     \$buildproductsdir;
 defvalopt '--clean',       '', $cleanmode_re, \$cleanmode;
 defvalopt '--quilt',     '', $quilt_modes_re, \$quilt_mode;
 
-defvalopt '', '-c', '.*=.*', sub { push @git, '-c', @_; };
-
 defvalopt '', '-C', '.+', sub {
     ($changesfile) = (@_);
     if ($changesfile =~ s#^(.*)/##) {
@@ -5174,6 +5185,12 @@ sub parseopts () {
 		} elsif (s/^-wc$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'check';
+		} elsif (s/^-c([^=]*)\=(.*)$//s) {
+		    push @git, '-c', $&;
+		    $gitcfgs{cmdline}{$1} = [ $2 ];
+		} elsif (s/^-c([^=]+)$//s) {
+		    push @git, '-c', $&;
+		    $gitcfgs{cmdline}{$1} = [ 'true' ];
 		} elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
 		    $val = $'; #';
 		    $val = undef unless length $val;
@@ -5199,16 +5216,18 @@ sub finalise_opts_opts () {
 	}
 
 	foreach my $c (access_cfg_cfgs("opts-$k")) {
-	    my $vl = $gitcfg{$c};
-	    printdebug "CL $c ",
-	        ($vl ? join " ", map { shellquote } @$vl : ""),
+	    my @vl =
+		map { $_ ? @$_ : () }
+		map { $gitcfgs{$_}{$c} }
+		reverse @gitcfgsources;
+	    printdebug "CL $c ", (join " ", map { shellquote } @vl),
 	        "\n" if $debuglevel >= 4;
-	    next unless $vl;
+	    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,
+		     @vl,
 		     @$om[$insertpos..$#$om] );
 	}
     }
-- 
2.30.2