mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  add-interactive: fix deletion of non-empty files
  pull: clarify advice for the unconfigured error case
This commit is contained in:
Junio C Hamano
2009-12-08 22:47:09 -08:00
parent ca83dc5391 5c30b8f7dd
commit ff86bdd5ca
3 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-add--interactive.perl
View File

@ -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);
}