add -p: don't rely on apply's '--recount' option

phillipwood · gitster · commit 3a8522f41ff4 · 2018-03-05T10:45:41.000-08:00
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 &lt;phillip.wood@dunelm.org.uk&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,7 @@ sub add_untracked_cmd {`
`677`	`677`	`sub run_git_apply {`
`678`	`678`	`my $cmd = shift;`
`679`	`679`	`my $fh;`
`680`		`- open $fh, '\| git ' . $cmd . " --recount --allow-overlap";`
	`680`	`+ open $fh, '\| git ' . $cmd . " --allow-overlap";`
`681`	`681`	`print $fh @_;`
`682`	`682`	`return close $fh;`
`683`	`683`	`}`