development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 10:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-add-p-delete-fix' into maint

Browse source 
* jk/maint-add-p-delete-fix:
  add-interactive: fix deletion of non-empty files
This commit is contained in:
Junio C Hamano 2009-12-08 22:37:50 -08:00
parent aa031314bf 8947fdd598
commit a876433c5f
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
git-add--interactive.perl
View file

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

20
t/t3701-add-interactive.sh
View file

@ -228,6 +228,26 @@ test_expect_success 'add first line works' '
test_cmp expected diff
'
cat >expected <<EOF
diff --git a/non-empty b/non-empty
deleted file mode 100644
index d95f3ad..0000000
--- a/non-empty
+++ /dev/null
@@ -1 +0,0 @@
-content
EOF
test_expect_success 'deleting a non-empty file' '
git reset --hard &&
echo content >non-empty &&
git add non-empty &&
git commit -m non-empty &&
rm non-empty &&
echo y | git add -p non-empty &&
git diff --cached >diff &&
test_cmp expected diff
'
cat >expected <<EOF
diff --git a/empty b/empty
deleted file mode 100644