From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Mon, 5 Mar 2018 10:56:30 +0000 (+0000)
Subject: add -p: don't rely on apply's '--recount' option
X-Git-Tag: v2.17.0-rc0~12^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3a8522f41ff45b16e06888d2b164252c9aeeaa03

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>
---

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 4a1e71d2e4..ab022ec073 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -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;
 }