summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2018-03-05 10:56:30 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-05 10:45:41 -0800
commit3a8522f41ff45b16e06888d2b164252c9aeeaa03 (patch)
tree59f018665de6695c7d4573869dd4c7e933948a84
parentadd -p: fix counting when splitting and coalescing (diff)
downloadtgif-3a8522f41ff45b16e06888d2b164252c9aeeaa03.tar.xz
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>
-rwxr-xr-xgit-add--interactive.perl2
1 files changed, 1 insertions, 1 deletions
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;
}