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

Merge branch 'cb/maint-rev-list-verify-object'

Browse Source 
* cb/maint-rev-list-verify-object:
  git rev-list: fix invalid typecast
This commit is contained in:
Junio C Hamano 2012-02-20 00:14:41 -08:00
commit abce5decd8
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/rev-list.c
View File

@ -180,10 +180,10 @@ static void show_object(struct object *obj,
const struct name_path *path, const char *component, const struct name_path *path, const char *component,
void *cb_data) void *cb_data)
{ {
struct rev_info *info = cb_data; struct rev_list_info *info = cb_data;
finish_object(obj, path, component, 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); parse_object(obj->sha1);
show_object_with_name(stdout, obj, path, component); show_object_with_name(stdout, obj, path, component);
} }

26
t/t1450-fsck.sh
View File

@ -191,4 +191,30 @@ test_expect_success 'cleaned up' '
test_cmp empty actual 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 test_done