add -p: don't rely on apply's '--recount' option
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Mon, 5 Mar 2018 10:56:30 +0000 (10:56 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2018 18:45:41 +0000 (10:45 -0800)
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>
git-add--interactive.perl
index 4a1e71d2e4b3f97284a09233e062f4852b6fc578..ab022ec0737607ef6b3302e6f9203835732cbe37 100755 (executable)
@@ -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;
 }