diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-21 14:59:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-21 14:59:35 -0800 |
| commit | 1e2545c6878665f2092940eab1aaeb20703f7d14 (patch) | |
| tree | 6cf49fda3413718d652e83a0c9738a232a489273 | |
| parent | c1ed5e6b14eb905ac9c745f2faf65d3b8b856101 (diff) | |
| parent | cb8da70547af5cd5c8e03be5a236971951e81277 (diff) | |
| download | git-1e2545c6878665f2092940eab1aaeb20703f7d14.tar.gz | |
Merge branch 'cb/maint-rev-list-verify-object' into maint
* cb/maint-rev-list-verify-object:
git rev-list: fix invalid typecast
| -rw-r--r-- | builtin/rev-list.c | 4 | ||||
| -rwxr-xr-x | t/t1450-fsck.sh | 26 |
2 files changed, 28 insertions, 2 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index ab3be7ca82..264e3ae9d8 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -180,10 +180,10 @@ static void show_object(struct object *obj, const struct name_path *path, const char *component, void *cb_data) { - struct rev_info *info = cb_data; + struct rev_list_info *info = cb_data; finish_object(obj, path, component, cb_data); - if (info->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT) + if (info->revs->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT) parse_object(obj->sha1); show_object_with_name(stdout, obj, path, component); } diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 523ce9c45b..5b8ebd8053 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -191,4 +191,30 @@ test_expect_success 'cleaned up' ' test_cmp empty actual ' +test_expect_success 'rev-list --verify-objects' ' + git rev-list --verify-objects --all >/dev/null 2>out && + test_cmp empty out +' + +test_expect_success 'rev-list --verify-objects with bad sha1' ' + sha=$(echo blob | git hash-object -w --stdin) && + old=$(echo $sha | sed "s+^..+&/+") && + new=$(dirname $old)/ffffffffffffffffffffffffffffffffffffff && + sha="$(dirname $new)$(basename $new)" && + mv .git/objects/$old .git/objects/$new && + test_when_finished "remove_object $sha" && + git update-index --add --cacheinfo 100644 $sha foo && + test_when_finished "git read-tree -u --reset HEAD" && + tree=$(git write-tree) && + test_when_finished "remove_object $tree" && + cmt=$(echo bogus | git commit-tree $tree) && + test_when_finished "remove_object $cmt" && + git update-ref refs/heads/bogus $cmt && + test_when_finished "git update-ref -d refs/heads/bogus" && + + test_might_fail git rev-list --verify-objects refs/heads/bogus >/dev/null 2>out && + cat out && + grep -q "error: sha1 mismatch 63ffffffffffffffffffffffffffffffffffffff" out +' + test_done |