From b1f6740e928e0deeb680b12a59d5b12899063320 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 25 Aug 2013 16:56:08 +0100 Subject: [PATCH] git-build (git-buildpackage wrapper) does not bother canonicalising the suite if --git-ignore-branch is used. --- debian/changelog | 2 ++ dgit | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e67bfe8c..cb218618 100644 --- 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 3cb47804..892cde2b 100755 --- 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(); } -- 2.30.2