X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-add--interactive.perl;h=cd43c3491260cb2aa51f0d19fd18ab66e4ad8217;hb=9c787f3f88f077ad23498cf03b1b57ac3bd41b33;hp=f813ffdaa1526aa68b4ed8e7d4d04b48e270496a;hpb=61b8f407a766bf10ec466e66ec606902a171fc85;p=git.git diff --git a/git-add--interactive.perl b/git-add--interactive.perl index f813ffdaa..cd43c3491 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1216,7 +1216,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); }