summaryrefslogtreecommitdiff
path: root/tree.h
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 /tree.h
parent0e04b248b5d5828b907a346e920dda4003311406 (diff)
parentce4e7b2ac38cfe5e4c165411d2e37b22e445ab88 (diff)
downloadgit-43262d8d6511212f49d519779505f8a557c8dc84.tar.gz
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 'tree.h')
-rw-r--r--tree.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/tree.h b/tree.h
index d24125f84f..d24786cba2 100644
--- a/tree.h
+++ b/tree.h
@@ -16,7 +16,11 @@ struct tree *lookup_tree(const unsigned char *sha1);
int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
-int parse_tree(struct tree *tree);
+int parse_tree_gently(struct tree *tree, int quiet_on_missing);
+static inline int parse_tree(struct tree *tree)
+{
+ return parse_tree_gently(tree, 0);
+}
void free_tree_buffer(struct tree *tree);
/* Parses and returns the tree in the given ent, chasing tags and commits. */