Skip to content

Commit

Permalink
add -p: don't rely on apply's '--recount' option
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
phillipwood authored and gitster committed Mar 5, 2018
1 parent b3e0fcf commit 3a8522f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-add--interactive.perl
Expand Up @@ -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;
}
Expand Down

0 comments on commit 3a8522f

Please sign in to comment.