From 86a5d4d40d42f13f7bcf9cd28edcc0e2bb779be4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 18 Oct 2016 19:01:26 +0100 Subject: [PATCH] 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 --- debian/changelog | 5 ++++- dgit | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c944a79..33b627ea 100644 --- 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 2cbb2fdf..c03c0316 100755 --- 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; } -- 2.30.2