From: Phillip Wood Date: Mon, 05 Mar 2018 10:56:30 GMT Subject: [PATCH v5 9/9] add -p: don't rely on apply's '--recount' option Message-ID: <20180305105630.14407-10-phillip.wood@talktalk.net> In-Reply-To: <20180305105630.14407-1-phillip.wood@talktalk.net> From: Phillip Wood 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 --- Notes: I can't think of a reason why this shouldn't be OK but I can't help feeling slightly nervous about it. I've made it a separate patch so it can be easily dropped or reverted if I've missed something. git-add--interactive.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-add--interactive.perl b/git-add--interactive.perl index d1b550d4d8..f83e7450ad 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; } -- 2.16.2