From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 7 Nov 2016 02:56:08 +0000 (+0000)
Subject: Actually honour the branch name for $isuite, if we are on dgit branch
X-Git-Tag: archive/debian/2.10~25
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6cd2df7eeec8f951c6b7971b1e1ffdce04dd633b

Actually honour the branch name for $isuite, if we are on dgit branch

As documented in the manpage.

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

diff --git a/debian/changelog b/debian/changelog
index c8f81558..bdc13eac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dgit (2.10~) unstable; urgency=medium
     build-essential.  But we don't actually need build-essential.)
   * When cloning a distro which has no git server, correctly leave
     the user on the local dgit branch, not on `master'.
+  * Actually honour the branch name, if we are on dgit branch, to specify
+    the suite, as documented in the manpage.
 
  --
 
diff --git a/dgit b/dgit
index a95629f5..aa5da935 100755
--- a/dgit
+++ b/dgit
@@ -3899,7 +3899,7 @@ sub fetchpullargs () {
 	$package = getfield $sourcep, 'Source';
     }
     if (@ARGV==0) {
-#	$isuite = branchsuite();  # this doesn't work because dak hates canons
+	$isuite = branchsuite();
 	if (!$isuite) {
 	    my $clogp = parsechangelog();
 	    $isuite = getfield $clogp, 'Distribution';