aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-01 15:43:34 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-01 15:46:13 -0700
commit5a48d24012fa39cdd02c1cb614db2e62d445e2ce (patch)
tree3803d06e4bcdb2c3e45c53ebefa1b3098a86d28a
parent4947367267cbcd0ca528711b2393613e2e817878 (diff)
downloadgit-5a48d24012fa39cdd02c1cb614db2e62d445e2ce.tar.gz
git-5a48d24012fa39cdd02c1cb614db2e62d445e2ce.tar.xz
rev-list --verify-object
Often we want to verify everything reachable from a given set of commits are present in our repository and connected without a gap to the tips of our refs. We used to do this for this purpose: $ rev-list --objects $commits_to_be_tested --not --all Even though this is good enough for catching missing commits and trees, we show the object name but do not verify their existence, let alone their well-formedness, for the blob objects at the leaf level. Add a new "--verify-object" option so that we can catch missing and broken blobs as well. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/rev-list.c4
-rw-r--r--revision.c5
-rw-r--r--revision.h1
3 files changed, 10 insertions, 0 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 920b91c0c..ab3be7ca8 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -180,7 +180,11 @@ static void show_object(struct object *obj,
const struct name_path *path, const char *component,
void *cb_data)
{
+ struct rev_info *info = cb_data;
+
finish_object(obj, path, component, cb_data);
+ if (info->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT)
+ parse_object(obj->sha1);
show_object_with_name(stdout, obj, path, component);
}
diff --git a/revision.c b/revision.c
index 072ddac47..5ef498b30 100644
--- a/revision.c
+++ b/revision.c
@@ -1383,6 +1383,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=")) {
diff --git a/revision.h b/revision.h
index da00a58fa..648876b35 100644
--- a/revision.h
+++ b/revision.h
@@ -53,6 +53,7 @@ struct rev_info {
tag_objects:1,
tree_objects:1,
blob_objects:1,
+ verify_objects:1,
edge_hint:1,
limited:1,
unpacked:1,