dgit gbp-build: No longer invent a --git-debian-branch option.

Usually the user is a maintainer using split brain, and we should rely
on their own gbp configuration to specify the right check.
Closes:#841100.

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

diff --git a/debian/changelog b/debian/changelog
index 1c944a797a8742f074eceb724a8a0ac9e9f653f4..33b627ea84efbda7e77bcff4f96e621eb4509cf5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 dgit (2.4~) unstable; urgency=low
 
-  * 
+  * dgit gbp-build: No longer invent a --git-debian-branch option.
+    Usually the user is a maintainer using split brain, and we should rely
+    on their own gbp configuration to specify the right check.
+    Closes:#841100.
 
  --
 

diff --git a/dgit b/dgit
index 2cbb2fdf36dc825559a6eac2b049eb360d78d693..c03c0316fa0b6cfef75ab41541d466c237ffcc87 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -4853,10 +4853,6 @@ sub cmd_gbp_build {
     }
     maybe_unapply_patches_again();
     if ($wantsrc < 2) {
-       unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
-           canonicalise_suite();
-           push @cmd, "--git-debian-branch=".lbranch();
-       }
        push @cmd, changesopts();
        runcmd_ordryrun_local @cmd, @ARGV;
     }