mirror of
https://github.com/git/git.git
synced 2024-10-28 04:49:43 +01:00
list-objects: always parse trees gently
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
9202489174
commit
f1d02daacf
1 changed files with 1 additions and 3 deletions
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue