From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 6 Nov 2015 16:10:51 +0000 (+0000)
Subject: When running dpkg-buildpackage, cope if user specified -g or -G.
X-Git-Tag: archive/debian/2.0~365
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=81aaaee0875d911dca013460b1087e5b56922c0f;p=dgit.git

When running dpkg-buildpackage, cope if user specified -g or -G.
---

diff --git a/debian/changelog b/debian/changelog
index 44aedd2e..49a72bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ dgit (1.5~~) unstable; urgency=medium
     to change for the dgit user.
 
   New checks and improved behaviours:
+  * When running dpkg-buildpackage, cope if user specified -g or -G.
   * dgit sbuild: check that the set of .changes files found is as we
     expect, before calling mergechanges.
   * dgit sbuild: Rename the used-up .changes files to `.inmulti' to
diff --git a/dgit b/dgit
index 9ac8d544..7ec09de8 100755
--- a/dgit
+++ b/dgit
@@ -3058,7 +3058,7 @@ sub massage_dbp_args ($;$) {
     push @newcmd, '-nc';
     # and some combinations of -S, -b, et al, are errors, rather than
     # later simply overriding earlier
-    push @newcmd, '-F' unless grep { m/^-[bBASF]$/ } (@$cmd, @$xargs);
+    push @newcmd, '-F' unless grep { m/^-[bBASFgG]$/ } (@$cmd, @$xargs);
     push @newcmd, @$cmd;
     @$cmd = @newcmd;
 }