undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "git add -u" data corruption.

Browse Source 
This applies to 'maint' to fix a rather serious data corruption
issue.  When "git add -u" affects a subdirectory in such a way
that the only changes to its contents are path removals, the
next tree object written out of that index was bogus, as the
remove codepath forgot to invalidate the cache-tree entry.

Reported by Salikh Zakirov.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2007-08-15 14:12:14 -07:00
parent 93969438dc
commit a4882c27f8
2 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin-add.c
View File

@ -115,6 +115,7 @@ static void update_callback(struct diff_queue_struct *q,
break; break;
case DIFF_STATUS_DELETED: case DIFF_STATUS_DELETED:
remove_file_from_cache(path); remove_file_from_cache(path);
cache_tree_invalidate_path(active_cache_tree, path);
if (verbose) if (verbose)
printf("remove '%s'\n", path); printf("remove '%s'\n", path);
break; break;

59
t/t2200-add-update.sh
View File

@ -13,26 +13,53 @@ only the updates to dir/sub.'
. ./test-lib.sh . ./test-lib.sh
test_expect_success 'setup' ' test_expect_success setup '
echo initial >top && echo initial >check &&
mkdir dir && echo initial >top &&
echo initial >dir/sub && mkdir dir1 dir2 &&
git-add dir/sub top && echo initial >dir1/sub1 &&
git-commit -m initial && echo initial >dir1/sub2 &&
echo changed >top && echo initial >dir2/sub3 &&
echo changed >dir/sub && git add check dir1 dir2 top &&
echo other >dir/other test_tick
git-commit -m initial &&
echo changed >check &&
echo changed >top &&
echo changed >dir2/sub3 &&
rm -f dir1/sub1 &&
echo other >dir2/other
' '
test_expect_success 'update' 'git-add -u dir' test_expect_success update '
git add -u dir1 dir2
'
test_expect_success 'update touched correct path' \ test_expect_success 'update noticed a removal' '
'test "`git-diff-files --name-status dir/sub`" = ""' test "$(git-ls-files dir1/sub1)" = ""
'
test_expect_success 'update did not touch other tracked files' \ test_expect_success 'update touched correct path' '
'test "`git-diff-files --name-status top`" = "M top"' test "$(git-diff-files --name-status dir2/sub3)" = ""
'
test_expect_success 'update did not touch untracked files' \ test_expect_success 'update did not touch other tracked files' '
'test "`git-diff-files --name-status dir/other`" = ""' test "$(git-diff-files --name-status check)" = "M check" &&
test "$(git-diff-files --name-status top)" = "M top"
'
test_expect_success 'update did not touch untracked files' '
test "$(git-ls-files dir2/other)" = ""
'
test_expect_success 'cache tree has not been corrupted' '
git ls-files -s |
sed -e "s/ 0 / /" >expect &&
git ls-tree -r $(git write-tree) |
sed -e "s/ blob / /" >current &&
diff -u expect current
'
test_done test_done