diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-25 18:02:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 18:02:10 (GMT) |
| commit | c53312583b2d25b6ed5f0aa421993795743d1da6 (patch) | |
| tree | 6c93284d0591ed5b210139fcfff040689f8199fa /list-objects.c | |
| parent | f249409b6be74132e80e6d83f264aaa158563be1 (diff) | |
| parent | ce4e7b2ac38cfe5e4c165411d2e37b22e445ab88 (diff) | |
| download | git-c53312583b2d25b6ed5f0aa421993795743d1da6.zip git-c53312583b2d25b6ed5f0aa421993795743d1da6.tar.gz git-c53312583b2d25b6ed5f0aa421993795743d1da6.tar.bz2 | |
Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/list-objects.c b/list-objects.c index 2a139b6..41736d2 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)); |