From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 9 Jan 2017 02:08:07 +0000 (+0000)
Subject: fetch and pull ignore the changelog suite when it is UNRELEASED.
X-Git-Tag: archive/debian/3.0~23
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b0bc4d204e5900c7888e681404e2638ce7347cf9

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 158bcaec..4556644d 100644
--- 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 f6c845d9..909ac95f 100755
--- 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;