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

Merge branch 'jk/maint-add-p-empty' into maint

Browse Source 
* jk/maint-add-p-empty:
  add-interactive: handle deletion of empty files
This commit is contained in:
Junio C Hamano
2009-11-16 00:02:44 -08:00
parent d404a3e1a5 24ab81ae4d
commit 5e9cb8666b
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
git-add--interactive.perl
View File

@ -731,14 +731,17 @@ sub parse_diff_header {
my $head = { TEXT => [], DISPLAY => [], TYPE => 'header' }; my $head = { TEXT => [], DISPLAY => [], TYPE => 'header' };
my $mode = { TEXT => [], DISPLAY => [], TYPE => 'mode' }; my $mode = { TEXT => [], DISPLAY => [], TYPE => 'mode' };
my $deletion = { TEXT => [], DISPLAY => [], TYPE => 'deletion' };
for (my $i = 0; $i < @{$src->{TEXT}}; $i++) { for (my $i = 0; $i < @{$src->{TEXT}}; $i++) {
my $dest = $src->{TEXT}->[$i] =~ /^(old|new) mode (\d+)$/ ? my $dest =
$mode : $head; $src->{TEXT}->[$i] =~ /^(old|new) mode (\d+)$/ ? $mode :
$src->{TEXT}->[$i] =~ /^deleted file/ ? $deletion :
$head;
push @{$dest->{TEXT}}, $src->{TEXT}->[$i]; push @{$dest->{TEXT}}, $src->{TEXT}->[$i];
push @{$dest->{DISPLAY}}, $src->{DISPLAY}->[$i]; push @{$dest->{DISPLAY}}, $src->{DISPLAY}->[$i];
} }
return ($head, $mode); return ($head, $mode, $deletion);
} }
sub hunk_splittable { sub hunk_splittable {
@ -1206,7 +1209,7 @@ sub patch_update_file {
my ($ix, $num); my ($ix, $num);
my $path = shift; my $path = shift;
my ($head, @hunk) = parse_diff($path); my ($head, @hunk) = parse_diff($path);
($head, my $mode) = parse_diff_header($head); ($head, my $mode, my $deletion) = parse_diff_header($head);
for (@{$head->{DISPLAY}}) { for (@{$head->{DISPLAY}}) {
print; print;
} }
@ -1214,6 +1217,9 @@ sub patch_update_file {
if (@{$mode->{TEXT}}) { if (@{$mode->{TEXT}}) {
unshift @hunk, $mode; unshift @hunk, $mode;
} }
if (@{$deletion->{TEXT}} && !@hunk) {
@hunk = ($deletion);
}
$num = scalar @hunk; $num = scalar @hunk;
$ix = 0; $ix = 0;
@ -1267,7 +1273,9 @@ sub patch_update_file {
print; print;
} }
print colored $prompt_color, $patch_mode_flavour{VERB}, print colored $prompt_color, $patch_mode_flavour{VERB},
($hunk[$ix]{TYPE} eq 'mode' ? ' mode change' : ' this hunk'), ($hunk[$ix]{TYPE} eq 'mode' ? ' mode change' :
$hunk[$ix]{TYPE} eq 'deletion' ? ' deletion' :
' this hunk'),
$patch_mode_flavour{TARGET}, $patch_mode_flavour{TARGET},
" [y,n,q,a,d,/$other,?]? "; " [y,n,q,a,d,/$other,?]? ";
my $line = prompt_single_character; my $line = prompt_single_character;

17
t/t3701-add-interactive.sh
View File

@ -228,4 +228,21 @@ test_expect_success 'add first line works' '
test_cmp expected diff test_cmp expected diff
' '
cat >expected <<EOF
diff --git a/empty b/empty
deleted file mode 100644
index e69de29..0000000
EOF
test_expect_success 'deleting an empty file' '
git reset --hard &&
> empty &&
git add empty &&
git commit -m empty &&
rm empty &&
echo y | git add -p empty &&
git diff --cached >diff &&
test_cmp expected diff
'
test_done test_done