summaryrefslogtreecommitdiff
path: root/git-add--interactive.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-09 06:37:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-09 06:37:50 (GMT)
commita876433c5fc27cc14860dea3d608ab4e0ff62380 (patch)
treecfe391565fbf9c93b86ebd53f2d6b63bb99b6a74 /git-add--interactive.perl
parentaa031314bf8189a15290d5bd0d85fa2a0307ceb7 (diff)
parent8947fdd598848b8ceb2cea9ff42e906c946eae5c (diff)
downloadgit-a876433c5fc27cc14860dea3d608ab4e0ff62380.zip
git-a876433c5fc27cc14860dea3d608ab4e0ff62380.tar.gz
git-a876433c5fc27cc14860dea3d608ab4e0ff62380.tar.bz2
Merge branch 'jk/maint-add-p-delete-fix' into maint
* jk/maint-add-p-delete-fix: add-interactive: fix deletion of non-empty files
Diffstat (limited to 'git-add--interactive.perl')
-rwxr-xr-xgit-add--interactive.perl6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 8ce1ec9..75b7196 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1217,7 +1217,11 @@ sub patch_update_file {
if (@{$mode->{TEXT}}) {
unshift @hunk, $mode;
}
- if (@{$deletion->{TEXT}} && !@hunk) {
+ if (@{$deletion->{TEXT}}) {
+ foreach my $hunk (@hunk) {
+ push @{$deletion->{TEXT}}, @{$hunk->{TEXT}};
+ push @{$deletion->{DISPLAY}}, @{$hunk->{DISPLAY}};
+ }
@hunk = ($deletion);
}