From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 6 Jul 2018 20:17:18 +0000 (+0100)
Subject: dgit, git-debrebase: Properly make patches with nasty .gitignores.
X-Git-Tag: archive/debian/5.8~7
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0899e14ec8d3eb877f4190882c5c3e92d02c460b;hp=7c3755874bd9192ce777c5271b70174083919ecd

dgit, git-debrebase: Properly make patches with nasty .gitignores.

Specifically:

 * When running git status --porcelain, pass --ignored so it
   lists ignored files, and handle the ! output that it then
   produces.

 * Add missing -f to a few git add invocations.

I have done some greps ('git.*add', 'git.*status', 'porcelain', etc.)
to try to find other missed cases and none turned up.

git diff is OK because normally we pass two treeish arguments, in
which case the ignores are ignored by git diff.  When we are asking it
to look at the working tree, we are expecting it to ignore untracked
files (whether ignored or not), and diff tracked ones, which is what
it does.

Closes:#903130.

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

diff --git a/debian/changelog b/debian/changelog
index 04357f9c..375e783a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dgit (5.8~) unstable; urgency=medium
 
   Bugfixes:
+  * dgit, git-debrebase: Properly make patches even if an awkward
+    .gitignore ignores the things in debian/patches.  Closes:#903130.
   * dgit(1): Unscramble push[-source] descriptions.  Closes:#903116.
 
  --
diff --git a/dgit b/dgit
index 3a737d0b..0d36361f 100755
--- a/dgit
+++ b/dgit
@@ -3812,11 +3812,11 @@ sub quiltify_nofix_bail ($$) {
 }
 
 sub commit_quilty_patch () {
-    my $output = cmdoutput @git, qw(status --porcelain);
+    my $output = cmdoutput @git, qw(status --ignored --porcelain);
     my %adds;
     foreach my $l (split /\n/, $output) {
 	next unless $l =~ m/\S/;
-	if ($l =~ m{^(?:\?\?| [MADRC]) (.pc|debian/patches)}) {
+	if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
 	    $adds{$1}++;
 	}
     }
@@ -5318,7 +5318,7 @@ END
 	print SERIES "\n" or die $! unless $newline eq "\n";
 	print SERIES "auto-gitignore\n" or die $!;
 	close SERIES or die  $!;
-        runcmd @git, qw(add -- debian/patches/series), $gipatch;
+        runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
         commit_admin <<END
 Commit patch to update .gitignore
 
diff --git a/git-debrebase b/git-debrebase
index 658884d2..04befff5 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1504,7 +1504,7 @@ sub make_patches_staged ($) {
 	    { local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
 	    failedcmd @gbp_cmd;
 	}
-	runcmd @git, qw(add debian/patches);
+	runcmd @git, qw(add -f debian/patches);
     };
 }