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 c8f815588f508748dca4ec1f33e4c6c2bcc857b9..bdc13eac8a210bea1aa8bda060cd8b77f57d3966 100644 (file)
--- 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 a95629f52605f4246cdf39abde2012a9b5ea290b..aa5da935179512bc3390096faa6ebf0269ae15ff 100755 (executable)
--- 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';