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 /revision.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 'revision.c')
| -rw-r--r-- | revision.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -817,7 +817,7 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit, parent = parent->next; if (p) p->object.flags |= UNINTERESTING; - if (parse_commit(p) < 0) + if (parse_commit_gently(p, 1) < 0) continue; if (p->parents) mark_parents_uninteresting(p); @@ -844,7 +844,7 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit, for (parent = commit->parents; parent; parent = parent->next) { struct commit *p = parent->item; - if (parse_commit(p) < 0) + if (parse_commit_gently(p, revs->ignore_missing_links) < 0) return -1; if (revs->show_source && !p->util) p->util = commit->util; |