From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 Aug 2015 14:35:17 +0000 (+0100)
Subject: When running git-add in commit-quilty-patch, use -f and sometimes -A, so as to avoid... 
X-Git-Tag: debian/1.4~22
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3d241c37fc1139f8942299323d72fc2e493f036c;ds=sidebyside

When running git-add in commit-quilty-patch, use -f and sometimes -A, so as to avoid being broken by any .gitignore, etc.
---

diff --git a/debian/changelog b/debian/changelog
index 9177e0ea..cd360c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ dgit (1.4~~) UNRELEASED; urgency=low
     ac221d67, bug released in 0.22).
   * When running git-add in commit-quilty-patch, properly escape
     filenames (which git-add treats as glob patterns).
+  * When running git-add in commit-quilty-patch, use -f and sometimes -A,
+    so as to avoid being broken by any .gitignore, etc.
 
  --
 
diff --git a/dgit b/dgit
index baf30964..916177c3 100755
--- a/dgit
+++ b/dgit
@@ -1784,7 +1784,7 @@ sub commit_quilty_patch () {
 	return;
     }
     my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
-    runcmd_ordryrun_local @git, qw(add), @adds;
+    runcmd_ordryrun_local @git, qw(add -f), @adds;
     commit_admin "Commit Debian 3.0 (quilt) metadata";
 }
 
@@ -2526,7 +2526,7 @@ sub quiltify ($$) {
     remove_stray_gits();
     mktree_in_ud_here();
     rmtree '.pc';
-    runcmd @git, 'add', '.';
+    runcmd @git, qw(add -Af .);
     my $oldtiptree=git_write_tree();
     changedir '../work';