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

diff --git a/debian/changelog b/debian/changelog
index 44aedd2e16ceeaf010d58220d86ae1d9b1a5780c..49a72bbc5fc08e10c134b313f7ca10c49e331d52 100644 (file)
--- 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 9ac8d54435508550c0b557794f8a32a4d70437d6..7ec09de85d5932edccdd4b1308f38b505aa41e69 100755 (executable)
--- 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;
 }