microsoft/git - git

Автор SHA1 Сообщение Дата

Автор	SHA1	Сообщение	Дата
Junio C Hamano	4b28cd9f2f	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	2011-03-22 21:37:59 -07:00
Junio C Hamano	6e7d0efa90	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>	2011-03-14 12:33:58 -07:00

Junio C Hamano

4b28cd9f2f

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

2011-03-22 21:37:59 -07:00

Junio C Hamano

6e7d0efa90

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>

2011-03-14 12:33:58 -07:00

2 Коммитов