undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add -p: don't rely on apply's '--recount' option

Browse Source 
Now that add -p counts patches properly it should be possible to turn
off the '--recount' option when invoking 'git apply'

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2018-03-05 10:56:30 +00:00 committed by Junio C Hamano
parent b3e0fcfe42
commit 3a8522f41f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-add--interactive.perl
View File

@ -677,7 +677,7 @@ sub add_untracked_cmd {
sub run_git_apply { sub run_git_apply {
my $cmd = shift; my $cmd = shift;
my $fh; my $fh;
open $fh, '| git ' . $cmd . " --recount --allow-overlap"; open $fh, '| git ' . $cmd . " --allow-overlap";
print $fh @_; print $fh @_;
return close $fh; return close $fh;
} }