fetch and pull ignore the changelog suite when it is UNRELEASED.

Closes:#848646.

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

diff --git a/debian/changelog b/debian/changelog
index 158bcaec1cb7013f9d9609bc1e56da33a4a6ed92..4556644d689e9d10e1649a1c824d10b3ab245598 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ dgit (3.0~) unstable; urgency=medium
     and is now fixed even for more-extended ones.
   * dgit clone-dgit-repos-server uses readonly access.
     Closes:#850521.
+  * fetch and pull ignore the changelog suite when it is UNRELEASED.
+    Closes:#848646.
 
   Minor new feature:
   * distro alias facility in config space.  (Primarily for testing.)

diff --git a/dgit b/dgit
index f6c845d967da3d2083890f9ff832f999204ac00d..909ac95f75ceaef2fd5c05a226416ce785d9d750 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -4299,7 +4299,8 @@ sub fetchpullargs () {
        $isuite = branchsuite();
        if (!$isuite) {
            my $clogp = parsechangelog();
-           $isuite = getfield $clogp, 'Distribution';
+           my $clogsuite = getfield $clogp, 'Distribution';
+           $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
        }
     } elsif (@ARGV==1) {
        ($isuite) = @ARGV;