summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-21 22:59:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-21 22:59:35 (GMT)
commit1e2545c6878665f2092940eab1aaeb20703f7d14 (patch)
tree6cf49fda3413718d652e83a0c9738a232a489273 /builtin
parentc1ed5e6b14eb905ac9c745f2faf65d3b8b856101 (diff)
parentcb8da70547af5cd5c8e03be5a236971951e81277 (diff)
downloadgit-1e2545c6878665f2092940eab1aaeb20703f7d14.zip
git-1e2545c6878665f2092940eab1aaeb20703f7d14.tar.gz
git-1e2545c6878665f2092940eab1aaeb20703f7d14.tar.bz2
Merge branch 'cb/maint-rev-list-verify-object' into maint
* cb/maint-rev-list-verify-object: git rev-list: fix invalid typecast
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rev-list.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index ab3be7c..264e3ae 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);
}