summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:20 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:20 -0700
commit2e2e7e9dd07107af8ce96428929775f267fdf98a (patch)
tree2ad475466a598a0004fa13cb0e5a5eb53fa559e2 /revision.c
parentca0c9764bfe4f5d33551b5cca74eb0966f796baf (diff)
parent6b67e0dc068d1bfd07686071b70f60078380666f (diff)
downloadgit-2e2e7e9dd07107af8ce96428929775f267fdf98a.tar.gz
Merge branch 'jc/fetch-verify'
* jc/fetch-verify: fetch: verify we have everything we need before updating our ref rev-list --verify-object list-objects: pass callback data to show_objects()
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 19a493bf60..9bae329c15 100644
--- a/revision.c
+++ b/revision.c
@@ -1416,6 +1416,11 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->tree_objects = 1;
revs->blob_objects = 1;
revs->edge_hint = 1;
+ } else if (!strcmp(arg, "--verify-objects")) {
+ revs->tag_objects = 1;
+ revs->tree_objects = 1;
+ revs->blob_objects = 1;
+ revs->verify_objects = 1;
} else if (!strcmp(arg, "--unpacked")) {
revs->unpacked = 1;
} else if (!prefixcmp(arg, "--unpacked=")) {