From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Oct 2016 21:59:43 +0000 (+0000)
Subject: Properly fetch all archive dgit view tags, as we intended.
X-Git-Tag: archive/debian/2.9~20
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=641292893240af7b3fd429351cede2fb80a3e99b

Properly fetch all archive dgit view tags, as we intended.

This deals with the possible "bad object" problem from an in-archive
copy.  Any such in-archive copy should come with either an update to
the suite branch on the dgit-repos server (if maybe it needed a
pseudomerge for centrally maintained history), or be identical to the
upload's version tag.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index 19a1a9f7..ed7fd903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ dgit (2.9~) unstable; urgency=low
     Closes:#842608.
   * Cope when cloning suite which doesn't receive uploads,
     like testing.  Closes:#842621.
+  * Properly fetch all archive dgit view tags, as we intended.
 
  --
 
diff --git a/dgit b/dgit
index b17ed210..f494bb4d 100755
--- a/dgit
+++ b/dgit
@@ -2337,7 +2337,7 @@ END
 
 	# OK, now %want is exactly what we want for refs in @specs
 	my @fspecs = map {
-	    return () if !m/\*$/ && !exists $wantr{"refs/$_"};
+	    !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
 	    "+refs/$_:".lrfetchrefs."/$_";
 	} @specs;