diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-14 12:29:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-14 12:33:58 -0700 |
| commit | 6e7d0efa9058aa61147d9d18b33bd046055584e4 (patch) | |
| tree | 5dbf761777e72b22754887370aff3927f82ca200 /builtin-merge-recursive.c | |
| parent | 8d2dfc49b199c7da6faefd7993630f24bd37fee0 (diff) | |
| download | git-6e7d0efa9058aa61147d9d18b33bd046055584e4.tar.gz | |
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 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions