X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=c66c7a63a19162c86ccf71cc59513707d23e045e;hb=71437159c44af0328fc4bbc1826be18e4f057444;hp=d524bd2de0885bf2f2d1d5f5b8f145573259f845;hpb=2ecbfc70bba339e0475b745f5d5615675e427370;p=dgit.git

diff --git a/dgit b/dgit
index d524bd2d..c66c7a63 100755
--- a/dgit
+++ b/dgit
@@ -2515,7 +2515,14 @@ sub lrfetchref_used ($) {
 }
 
 sub git_lrfetch_sane {
-    my (@specs) = @_;
+    my ($supplementary, @specs) = @_;
+    # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
+    # at least as regards @specs.  Also leave the results in
+    # %lrfetchrefs_f, and arrange for lrfetchref_used to be
+    # able to clean these up.
+    #
+    # With $supplementary==1, @specs must not contain wildcards
+    # and we add to our previous fetches (non-atomically).
 
     # This is rather miserable:
     # When git fetch --prune is passed a fetchspec ending with a *,
@@ -2539,18 +2546,21 @@ sub git_lrfetch_sane {
     # git fetch to try to generate it.  If we don't manage to generate
     # the target state, we try again.
 
-    printdebug "git_lrfetch_sane specs @specs\n";
+    my $url = access_giturl();
+
+    printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
 
     my $specre = join '|', map {
 	my $x = $_;
 	$x =~ s/\W/\\$&/g;
-	$x =~ s/\\\*$/.*/;
+	my $wildcard = $x =~ s/\\\*$/.*/;
+	die if $wildcard && $supplementary;
 	"(?:refs/$x)";
     } @specs;
     printdebug "git_lrfetch_sane specre=$specre\n";
     my $wanted_rref = sub {
 	local ($_) = @_;
-	return m/^(?:$specre)$/o;
+	return m/^(?:$specre)$/;
     };
 
     my $fetch_iteration = 0;
@@ -2562,7 +2572,7 @@ sub git_lrfetch_sane {
 	}
 
 	my @look = map { "refs/$_" } @specs;
-	my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
+	my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
 	debugcmd "|",@lcmd;
 
 	my %wantr;
@@ -2590,11 +2600,12 @@ END
 
 	printdebug "git_lrfetch_sane fspecs @fspecs\n";
 
-	my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
-	runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
-	    @fspecs;
+	my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
+	runcmd_ordryrun_local @fcmd if @fspecs;
 
-	%lrfetchrefs_f = ();
+	if (!$supplementary) {
+	    %lrfetchrefs_f = ();
+	}
 	my %objgot;
 
 	git_for_each_ref(lrfetchrefs, sub {
@@ -2603,6 +2614,10 @@ END
 	    $objgot{$objid} = 1;
 	});
 
+	if ($supplementary) {
+	    last;
+	}
+
 	foreach my $lrefname (sort keys %lrfetchrefs_f) {
 	    my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
 	    if (!exists $wantr{$rrefname}) {
@@ -2662,7 +2677,7 @@ sub git_fetch_us () {
     push @specs, $rewritemap;
     push @specs, qw(heads/*) if deliberately_not_fast_forward;
 
-    git_lrfetch_sane @specs;
+    git_lrfetch_sane 0, @specs;
 
     my %here;
     my @tagpats = debiantags('*',access_nomdistro);