diff options
| author |  Jeff King <peff@peff.net> | 2017-01-16 16:24:03 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-17 12:49:41 -0800 |
| commit | 1ada11ee62658ff4366d93b97995eea055827171 (patch) | |
| tree | 98948f90721e734572c3224c24f849315670fc68 | |
| parent | Sync with maint-2.10 (diff) | |
| download | tgif-1ada11ee62658ff4366d93b97995eea055827171.tar.xz | |
t1450: clean up sub-objects in duplicate-entry test
This test creates a multi-level set of trees, but its
cleanup routine only removes the top-level tree. After the
test finishes, the inner tree and the blob it points to
remain, making the inner tree dangling.
A later test ("cleaned up") verifies that we've removed any
cruft and "git fsck" output is clean. This passes only
because of a bug in git-fsck which fails to notice dangling
trees.
In preparation for fixing the bug, let's teach this earlier
test to clean up after itself correctly. We have to remove
the inner tree (and therefore the blob, too, which becomes
dangling after removing that tree).
Since the setup code happens inside a subshell, we can't
just set a variable for each object. However, we can stuff
all of the sha1s into the $T output variable, which is not
used for anything except cleanup.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t1450-fsck.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index ee7d4736db..6eef8b28ed 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -189,14 +189,16 @@ test_expect_success 'commit with NUL in header' ' ' test_expect_success 'tree object with duplicate entries' ' - test_when_finished "remove_object \$T" && + test_when_finished "for i in \$T; do remove_object \$i; done" && T=$( GIT_INDEX_FILE=test-index && export GIT_INDEX_FILE && rm -f test-index && >x && git add x && + git rev-parse :x && T=$(git write-tree) && + echo $T && ( git cat-file tree $T && git cat-file tree $T |