X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=802d791fb7504af58a152b3c73d1787df37aa2ba;hb=62cdc56219b149617af4d303c782f3b37e22a529;hp=265978ea53cd0841de791d9aae3e409110caf4ac;hpb=b02532fd7d3c82864c76eecbfd99a1abc7e2c1b2;p=dgit.git

diff --git a/dgit b/dgit
index 265978ea..802d791f 100755
--- a/dgit
+++ b/dgit
@@ -111,7 +111,7 @@ sub lref () { return "refs/heads/".lbranch(); }
 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
 sub rrref () { return server_ref($csuite); }
 
-sub lrfetchrefs () { return "refs/dgit-fetch/$isuite"; }
+sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
 
 sub stripepoch ($) {
     my ($vsn) = @_;
@@ -1343,12 +1343,33 @@ sub ensure_we_have_orig () {
 }
 
 sub git_fetch_us () {
-    runcmd_ordryrun_local @git, qw(fetch),access_giturl(),fetchspec();
-    if (deliberately_not_fast_forward) {
-	runcmd_ordryrun_local @git, qw(fetch -p), access_giturl(),
-	    map { "+refs/$_/*:".lrfetchrefs."/$_/*" }
-	    qw(tags heads);
-    }
+    my @specs = (fetchspec());
+    push @specs,
+        map { "+refs/$_/*:".lrfetchrefs."/$_/*" }
+        qw(tags heads);
+    runcmd_ordryrun_local @git, qw(fetch -p -n), access_giturl(), @specs;
+
+    my %here;
+    my $tagpat = debiantag('*',access_basedistro);
+
+    git_for_each_ref("refs/tags/".$tagpat, sub {
+	my ($objid,$objtype,$fullrefname,$reftail) = @_;
+	printdebug "currently $fullrefname=$objid\n";
+	$here{$fullrefname} = $objid;
+    });
+    git_for_each_ref(lrfetchrefs."/tags/".$tagpat, sub {
+	my ($objid,$objtype,$fullrefname,$reftail) = @_;
+	my $lref = "refs".substr($fullrefname, length lrfetchrefs);
+	printdebug "offered $lref=$objid\n";
+	if (!defined $here{$lref}) {
+	    my @upd = (@git, qw(update-ref), $lref, $objid, '');
+	    runcmd_ordryrun_local @upd;
+	} elsif ($here{$lref} eq $objid) {
+	} else {
+	    print STDERR \
+		"Not updateting $lref from $here{$lref} to $objid.\n";
+	}
+    });
 }
 
 sub fetch_from_archive () {
@@ -1455,6 +1476,11 @@ END
     return 1;
 }
 
+sub set_local_git_config ($$) {
+    my ($k, $v) = @_;
+    runcmd @git, qw(config), $k, $v;
+}
+
 sub clone ($) {
     my ($dstdir) = @_;
     canonicalise_suite();
@@ -1465,7 +1491,7 @@ sub clone ($) {
     runcmd @git, qw(init -q);
     my $giturl = access_giturl(1);
     if (defined $giturl) {
-	runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec();
+	set_local_git_config "remote.$remotename.fetch", fetchspec();
 	open H, "> .git/HEAD" or die $!;
 	print H "ref: ".lref()."\n" or die $!;
 	close H or die $!;
@@ -1897,10 +1923,12 @@ sub cmd_push {
     if ($new_package) {
 	local ($package) = $existing_package; # this is a hack
 	canonicalise_suite();
-    }
-    if (defined $specsuite && $specsuite ne $isuite) {
+    } else {
 	canonicalise_suite();
-	$csuite eq $specsuite or
+    }
+    if (defined $specsuite &&
+	$specsuite ne $isuite &&
+	$specsuite ne $csuite) {
 	    fail "dgit push: changelog specifies $isuite ($csuite)".
 	        " but command line specifies $specsuite";
     }