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>
Phillip Wood committed
Mar 5, 2018 at 10:56 UTC
3a8522f41ff45b16e06888d2b164252c9aeeaa03
1 file changed
+1
-1
git-add--interactive.perl
+1
-1
@@ -677,7 +677,7 @@ sub add_untracked_cmd {
677
sub run_git_apply {
678
my $cmd = shift;
679
my $fh;
680
- open $fh, '| git ' . $cmd . " --recount --allow-overlap";
680
+ open $fh, '| git ' . $cmd . " --allow-overlap";
681
print $fh @_;
682
return close $fh;
683
}