[PATCH v6 3/6] list-objects: always parse trees gently
- From
Matthew DeVore <matvore@google.com>
- Date
- Aug 15, 2018, 23:19 UTC
- Message-ID
- <55da169659b3c04e3f38f876744ee76eb6d0db93.1534374650.git.matvore@google.com>
- In-Reply-To
- <cover.1534374650.git.matvore@google.com>
If parsing fails when revs->ignore_missing_links and revs->exclude_promisor_objects are both false, we print the OID anyway in the die("bad tree object...") call, so any message printed by parse_tree_gently() is superfluous.
Signed-off-by: Matthew DeVore <matvore@google.com> --- list-objects.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/list-objects.c b/list-objects.c index ccc529e5e..f9b51db7a 100644 --- a/list-objects.c +++ b/list-objects.c @@ -143,8 +143,6 @@ static void process_tree(struct traversal_context *ctx, struct rev_info *revs = ctx->revs; int baselen = base->len; enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW; - int gently = revs->ignore_missing_links || - revs->exclude_promisor_objects; if (!revs->tree_objects) return; @@ -152,7 +150,7 @@ 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) { + if (parse_tree_gently(tree, 1) < 0) { if (revs->ignore_missing_links) return;
-- 2.18.0.865.gffc8e1a3cd6-goog