chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When running git-add in commit-quilty-patch, use -f and sometimes -A, so as to avoid...
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 8f0052bf87182d87c1db497c57e8dabcddd8e49b..916177c3cd0ed895c727abfe9dc585c6950dfe3e 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-1783,7
+1783,8
@@
sub commit_quilty_patch () {
progress "nothing quilty to commit, ok.";
return;
}
progress "nothing quilty to commit, ok.";
return;
}
- runcmd_ordryrun_local @git, qw(add), sort keys %adds;
+ my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
+ runcmd_ordryrun_local @git, qw(add -f), @adds;
commit_admin "Commit Debian 3.0 (quilt) metadata";
}
commit_admin "Commit Debian 3.0 (quilt) metadata";
}
@@
-2525,7
+2526,7
@@
sub quiltify ($$) {
remove_stray_gits();
mktree_in_ud_here();
rmtree '.pc';
remove_stray_gits();
mktree_in_ud_here();
rmtree '.pc';
- runcmd @git,
'add', '.'
;
+ runcmd @git,
qw(add -Af .)
;
my $oldtiptree=git_write_tree();
changedir '../work';
my $oldtiptree=git_write_tree();
changedir '../work';