[PATCH 5/5] rev-list: handle missing tree objects properly
- From
Matthew DeVore <matvore@google.com>
- Date
- Aug 9, 2018, 22:45 UTC
- Message-ID
- <54d827e7c0dc757451fa10f5bd0752e1e3356281.1533854545.git.matvore@google.com>
- In-Reply-To
- <cover.1533854545.git.matvore@google.com>
Previously, we assumed only blob objects could be missing. This patch makes rev-list handle missing trees like missing blobs. A missing tree will cause an error if --missing indicates an error should be caused, and the hash is printed even if the tree is missing.
Signed-off-by: Matthew DeVore <matvore@google.com> --- builtin/rev-list.c | 12 ++++++++---- list-objects.c | 8 ++++++-- revision.h | 1 + t/t5616-partial-clone.sh | 27 +++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 5b07f3f4a..c870d4fe6 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -6,6 +6,7 @@ #include "list-objects.h" #include "list-objects-filter.h" #include "list-objects-filter-options.h" +#include "object.h" #include "object-store.h" #include "pack.h" #include "pack-bitmap.h" @@ -209,7 +210,8 @@ static inline void finish_object__ma(struct object *obj) */ switch (arg_missing_action) { case MA_ERROR: - die("missing blob object '%s'", oid_to_hex(&obj->oid)); + die("missing %s object '%s'", + type_name(obj->type), oid_to_hex(&obj->oid)); return; case MA_ALLOW_ANY: @@ -222,8 +224,8 @@ static inline void finish_object__ma(struct object *obj) case MA_ALLOW_PROMISOR: if (is_promisor_object(&obj->oid)) return; - die("unexpected missing blob object '%s'", - oid_to_hex(&obj->oid)); + die("unexpected missing %s object '%s'", + type_name(obj->type), oid_to_hex(&obj->oid)); return; default: @@ -235,7 +237,7 @@ static inline void finish_object__ma(struct object *obj) static int finish_object(struct object *obj, const char *name, void *cb_data) { struct rev_list_info *info = cb_data; - if (obj->type == OBJ_BLOB && !has_object_file(&obj->oid)) { + if (!has_object_file(&obj->oid)) { finish_object__ma(obj); return 1; } @@ -373,6 +375,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) init_revisions(&revs, prefix); revs.abbrev = DEFAULT_ABBREV; revs.commit_format = CMIT_FMT_UNSPECIFIED; + revs.show_missing_trees = 1; /* * Scan the argument list before invoking setup_revisions(), so that we @@ -389,6 +392,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (!strcmp(arg, "--exclude-promisor-objects")) { fetch_if_missing = 0; revs.exclude_promisor_objects = 1; + revs.show_missing_trees = 0; break; } } diff --git a/list-objects.c b/list-objects.c index 7ecdb95ce..b0291c45a 100644 --- a/list-objects.c +++ b/list-objects.c @@ -146,7 +146,9 @@ static void process_tree(struct traversal_context *ctx, int baselen = base->len; enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW; int gently = revs->ignore_missing_links || + revs->show_missing_trees || revs->exclude_promisor_objects; + int parse_result; if (!revs->tree_objects) return; @@ -154,7 +156,8 @@ static void process_tree(struct traversal_context *ctx, die("bad tree object"); if (obj->flags & (UNINTERESTING | SEEN)) return; - if (parse_tree_gently(tree, gently) < 0) { + parse_result = parse_tree_gently(tree, gently); + if (parse_result < 0 && !revs->show_missing_trees) { if (revs->ignore_missing_links) return; @@ -182,7 +185,8 @@ static void process_tree(struct traversal_context *ctx, if (base->len) strbuf_addch(base, '/'); - process_tree_contents(ctx, tree, base); + if (parse_result >= 0) + process_tree_contents(ctx, tree, base); if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn) { r = ctx->filter_fn(LOFS_END_TREE, obj, diff --git a/revision.h b/revision.h index cd6b62313..34ff99f05 100644 --- a/revision.h +++ b/revision.h @@ -128,6 +128,7 @@ struct rev_info { first_parent_only:1, line_level_traverse:1, tree_blobs_in_commit_order:1, + show_missing_trees:1, /* for internal use only */ exclude_promisor_objects:1; diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh index bbbe7537d..8a0ca0a74 100755 --- a/t/t5616-partial-clone.sh +++ b/t/t5616-partial-clone.sh @@ -170,6 +170,33 @@ test_expect_success 'partial clone fetches blobs pointed to by refs even if norm git -C dst fsck ' +test_expect_success 'can use only:commits to filter partial clone' ' + rm -rf dst && + git clone --no-checkout --filter=only:commits "file://$(pwd)/srv.bare" dst && + git -C dst rev-list master --missing=allow-any --objects >fetched_objects && + cat fetched_objects \ + | awk -f print_1.awk \ + | xargs -n1 git -C dst cat-file -t >fetched_types && + sort fetched_types -u >unique_types.observed && + echo commit > unique_types.expected && + test_cmp unique_types.observed unique_types.expected +' + +test_expect_success 'show missing tree objects with --missing=print' ' + git -C dst rev-list master --missing=print --quiet --objects >missing_objs && + sed "s/?//" missing_objs \ + | xargs -n1 git -C srv.bare cat-file -t \ + >missing_types && + sort -u missing_types >missing_types.uniq && + echo tree >expected && + test_cmp missing_types.uniq expected +' + +test_expect_success 'do not complain when a missing tree cannot be parsed' ' + git -C dst rev-list master --missing=print --quiet --objects 2>rev_list_err >&2 && + ! grep -q "Could not read " rev_list_err +' + . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd
-- 2.18.0.597.ga71716f1ad-goog