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 19a1a9f7bdbc48a06397b5c785b8f614a2ad9477..ed7fd903d77ff5b191891b8ab8cb88ef6624d8a6 100644 (file)
--- 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 b17ed210119318196bfaa6ae26dc5ea94a341531..f494bb4d5a266cd628523c58bbac372d3365e307 100755 (executable)
--- 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;