git-build (git-buildpackage wrapper) does not bother canonicalising the suite if...

diff --git a/debian/changelog b/debian/changelog
index e67bfe8c928e0bc1e5ed21924f48a1894064294f..cb2186181be0bc63d4995ee717f2370f71c3f75d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ dgit (0.11) unstable; urgency=low
   * Fix some bugs in building (eg build-source would fail to do the quilt
     fixup; the --clean check in build was wrong).
   * Add missing dependency on realpath.
+  * git-build (git-buildpackage wrapper) does not bother canonicalising
+    the suite if --git-ignore-branch is used.
 
  --
 

diff --git a/dgit b/dgit
index 3cb47804fdd854f7cd42524b17c4d0d5175da270..892cde2baf84b63c41fff2b42547c335814f24a0 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1077,7 +1077,7 @@ sub cmd_git_build {
     my @cmd =
        (qw(git-buildpackage -us -uc --git-no-sign-tags),
         "--git-builder=@dpkgbuildpackage");
-    unless (grep { m/^--git-debian-branch/ } @ARGV) {
+    unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
        canonicalise_suite();
        push @cmd, "--git-debian-branch=".lbranch();
     }