development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-28 19:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

add--interactive.perl: factor out repeated --recount option

Browse source 
Depending on the direction and the target of patch application, we would
need to pass --cached and --reverse to underlying "git apply".  Also we
only pass --check when we are not applying but just checking.

But we always pass --recount since 8cbd431 (git-add--interactive: replace
hunk recounting with apply --recount, 2008-07-02).  Instead of repeating
the same --recount over and over again, move it to a single place that
actually runs the command, namely, "run_git_apply" subroutine.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-04-06 14:12:34 -07:00
parent f3217e2b17
commit 9dce832354
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
git-add--interactive.perl
View file

@ -705,7 +705,7 @@ sub add_untracked_cmd {
sub run_git_apply { sub run_git_apply {
my $cmd = shift; my $cmd = shift;
my $fh; my $fh;
open $fh, '| git ' . $cmd; open $fh, '| git ' . $cmd . " --recount";
print $fh @_; print $fh @_;
return close $fh; return close $fh;
} }
@ -1050,7 +1050,7 @@ sub edit_hunk_manually {
sub diff_applies { sub diff_applies {
my $fh; my $fh;
return run_git_apply($patch_mode_flavour{APPLY_CHECK} . ' --recount --check', return run_git_apply($patch_mode_flavour{APPLY_CHECK} . ' --check',
map { @{$_->{TEXT}} } @_); map { @{$_->{TEXT}} } @_);
} }
@ -1139,7 +1139,7 @@ sub help_patch_cmd {
sub apply_patch { sub apply_patch {
my $cmd = shift; my $cmd = shift;
my $ret = run_git_apply $cmd . ' --recount', @_; my $ret = run_git_apply $cmd, @_;
if (!$ret) { if (!$ret) {
print STDERR @_; print STDERR @_;
} }
@ -1148,17 +1148,17 @@ sub apply_patch {
sub apply_patch_for_checkout_commit { sub apply_patch_for_checkout_commit {
my $reverse = shift; my $reverse = shift;
my $applies_index = run_git_apply 'apply '.$reverse.' --cached --recount --check', @_; my $applies_index = run_git_apply 'apply '.$reverse.' --cached --check', @_;
my $applies_worktree = run_git_apply 'apply '.$reverse.' --recount --check', @_; my $applies_worktree = run_git_apply 'apply '.$reverse.' --check', @_;
if ($applies_worktree && $applies_index) { if ($applies_worktree && $applies_index) {
run_git_apply 'apply '.$reverse.' --cached --recount', @_; run_git_apply 'apply '.$reverse.' --cached', @_;
run_git_apply 'apply '.$reverse.' --recount', @_; run_git_apply 'apply '.$reverse, @_;
return 1; return 1;
} elsif (!$applies_index) { } elsif (!$applies_index) {
print colored $error_color, "The selected hunks do not apply to the index!\n"; print colored $error_color, "The selected hunks do not apply to the index!\n";
if (prompt_yesno "Apply them to the worktree anyway? ") { if (prompt_yesno "Apply them to the worktree anyway? ") {
return run_git_apply 'apply '.$reverse.' --recount', @_; return run_git_apply 'apply '.$reverse, @_;
} else { } else {
print colored $error_color, "Nothing was applied.\n"; print colored $error_color, "Nothing was applied.\n";
return 0; return 0;