summaryrefslogtreecommitdiff
path: root/list-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-22 21:37:59 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-22 21:37:59 -0700
commit4b28cd9f2fb755cdfe1b97130e84644ae932988c (patch)
treec48bc072cd6d6d6b27f4bf1e38c2481bb6a4ace6 /list-objects.c
parent91b3c7ce8e189b90d3203265c9625806a15045e1 (diff)
parent6e7d0efa9058aa61147d9d18b33bd046055584e4 (diff)
downloadgit-4b28cd9f2fb755cdfe1b97130e84644ae932988c.tar.gz
Merge branch 'jc/maint-rev-list-culled-boundary'
* jc/maint-rev-list-culled-boundary: list-objects.c: don't add an unparsed NULL as a pending tree Conflicts: list-objects.c
Diffstat (limited to 'list-objects.c')
-rw-r--r--list-objects.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/list-objects.c b/list-objects.c
index 61f6cc98d9..838b6a732e 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -173,7 +173,12 @@ void traverse_commit_list(struct rev_info *revs,
strbuf_init(&base, PATH_MAX);
while ((commit = get_revision(revs)) != NULL) {
- add_pending_tree(revs, commit->tree);
+ /*
+ * an uninteresting boundary commit may not have its tree
+ * parsed yet, but we are not going to show them anyway
+ */
+ if (commit->tree)
+ add_pending_tree(revs, commit->tree);
show_commit(commit, data);
}
for (i = 0; i < revs->pending.nr; i++) {