mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
add -p: don't rely on apply's '--recount' option
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:
parent
b3e0fcfe42
commit
3a8522f41f
|
@ -677,7 +677,7 @@ sub add_untracked_cmd {
|
|||
sub run_git_apply {
|
||||
my $cmd = shift;
|
||||
my $fh;
|
||||
open $fh, '| git ' . $cmd . " --recount --allow-overlap";
|
||||
open $fh, '| git ' . $cmd . " --allow-overlap";
|
||||
print $fh @_;
|
||||
return close $fh;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue