When running git-add in commit-quilty-patch, use -f and sometimes -A, so as to avoid...

diff --git a/debian/changelog b/debian/changelog
index 9177e0ead2779ba89211311d0777ce73bb6e2d2c..cd360c6da576fbc4025a4e9990ec7cdce5b54e39 100644 (file)
--- 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 baf3096463d5be4deafb4c7f4746e5cd055de07f..916177c3cd0ed895c727abfe9dc585c6950dfe3e 100755 (executable)
--- 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';