diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-14 19:29:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-14 19:33:58 (GMT) |
| commit | 6e7d0efa9058aa61147d9d18b33bd046055584e4 (patch) | |
| tree | 5dbf761777e72b22754887370aff3927f82ca200 /list-objects.c | |
| parent | 8d2dfc49b199c7da6faefd7993630f24bd37fee0 (diff) | |
| download | git-6e7d0efa9058aa61147d9d18b33bd046055584e4.zip git-6e7d0efa9058aa61147d9d18b33bd046055584e4.tar.gz git-6e7d0efa9058aa61147d9d18b33bd046055584e4.tar.bz2 | |
list-objects.c: don't add an unparsed NULL as a pending tree
"git rev-list --first-parent --boundary $commit^..$commit" segfaults on a
merge commit since 8d2dfc4 (process_{tree,blob}: show objects without
buffering, 2009-04-10), as it tried to dereference a commit that was
discarded as UNINTERESTING without being parsed (hence lacking "tree").
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'list-objects.c')
| -rw-r--r-- | list-objects.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/list-objects.c b/list-objects.c index 5a4af62..518c665 100644 --- a/list-objects.c +++ b/list-objects.c @@ -147,7 +147,12 @@ void traverse_commit_list(struct rev_info *revs, struct commit *commit; 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); } for (i = 0; i < revs->pending.nr; i++) { |