diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-08-18 15:35:17 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-08-18 15:35:17 +0100 |
commit | 3d241c37fc1139f8942299323d72fc2e493f036c (patch) | |
tree | ff0d9f81aec03336c179a0207b5465971ea4eac1 /dgit | |
parent | 19d5fe05b5568ba5e8119f302f0bb9cbc043e732 (diff) |
When running git-add in commit-quilty-patch, use -f and sometimes -A, so as to avoid being broken by any .gitignore, etc.
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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'; |