summaryrefslogtreecommitdiffstats
path: root/list-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-11 09:29:58 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-11 09:29:59 -0700
commit43262d8d6511212f49d519779505f8a557c8dc84 (patch)
tree3a68ca86e32cb14060f97ba4e603affc263ecbdf /list-objects.c
parent0e04b248b5d5828b907a346e920dda4003311406 (diff)
parentce4e7b2ac38cfe5e4c165411d2e37b22e445ab88 (diff)
downloadgit-43262d8d6511212f49d519779505f8a557c8dc84.tar.gz
git-43262d8d6511212f49d519779505f8a557c8dc84.tar.xz
Merge branch 'jk/squelch-missing-link-warning-for-unreachable'
Recent "git prune" traverses young unreachable objects to safekeep old objects in the reachability chain from them, which sometimes caused error messages that are unnecessarily alarming. * jk/squelch-missing-link-warning-for-unreachable: suppress errors on missing UNINTERESTING links silence broken link warnings with revs->ignore_missing_links add quieter versions of parse_{tree,commit}
Diffstat (limited to 'list-objects.c')
-rw-r--r--list-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/list-objects.c b/list-objects.c
index 2a139b6ce..41736d237 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -81,7 +81,7 @@ static void process_tree(struct rev_info *revs,
die("bad tree object");
if (obj->flags & (UNINTERESTING | SEEN))
return;
- if (parse_tree(tree) < 0) {
+ if (parse_tree_gently(tree, revs->ignore_missing_links) < 0) {
if (revs->ignore_missing_links)
return;
die("bad tree object %s", sha1_to_hex(obj->sha1));