diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-02-11 12:40:12 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-02-11 12:40:12 +0300 |
commit | 92798702cf6d201f80e257a07d0a0c40565c79fe (patch) | |
tree | dd283f28f9f630b5c5ff76456cb46368ebbacc2e | |
parent | f23ffbe890d36e277f02d4a84c2b52de3a4e3173 (diff) | |
parent | ed62089c1c32a9bfca2ec61d331a70443647344c (diff) |
Merge branch 'maint-1.5.4' into maint-1.5.5
* maint-1.5.4:
revision traversal and pack: notice and die on missing commit
-rw-r--r-- | revision.c | 6 | ||||
-rwxr-xr-x | t/t5307-pack-missing-commit.sh | 39 |
2 files changed, 43 insertions, 2 deletions
diff --git a/revision.c b/revision.c index ffbed3fbf2..07e5fcd86c 100644 --- a/revision.c +++ b/revision.c @@ -1561,14 +1561,16 @@ static struct commit *get_revision_1(struct rev_info *revs) (commit->date < revs->max_age)) continue; if (add_parents_to_list(revs, commit, &revs->commits) < 0) - return NULL; + die("Failed to traverse parents of commit %s", + sha1_to_hex(commit->object.sha1)); } switch (simplify_commit(revs, commit)) { case commit_ignore: continue; case commit_error: - return NULL; + die("Failed to simplify parents of commit %s", + sha1_to_hex(commit->object.sha1)); default: return commit; } diff --git a/t/t5307-pack-missing-commit.sh b/t/t5307-pack-missing-commit.sh new file mode 100755 index 0000000000..ae52a1882d --- /dev/null +++ b/t/t5307-pack-missing-commit.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +test_description='pack should notice missing commit objects' + +. ./test-lib.sh + +test_expect_success setup ' + for i in 1 2 3 4 5 + do + echo "$i" >"file$i" && + git add "file$i" && + test_tick && + git commit -m "$i" && + git tag "tag$i" + done && + obj=$(git rev-parse --verify tag3) && + fanout=$(expr "$obj" : "\(..\)") && + remainder=$(expr "$obj" : "..\(.*\)") && + rm -f ".git/objects/$fanout/$remainder" +' + +test_expect_success 'check corruption' ' + test_must_fail git fsck +' + +test_expect_success 'rev-list notices corruption (1)' ' + test_must_fail git rev-list HEAD +' + +test_expect_success 'rev-list notices corruption (2)' ' + test_must_fail git rev-list --objects HEAD +' + +test_expect_success 'pack-objects notices corruption' ' + echo HEAD | + test_must_fail git pack-objects --revs pack +' + +test_done |