-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
Junio C Hamano
committed
Mar 14, 2011
1 parent
8d2dfc4
commit 6e7d0ef
Showing
2 changed files
with
33 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
#!/bin/sh | ||
|
||
test_description='operations that cull histories in unusual ways' | ||
. ./test-lib.sh | ||
|
||
test_commit () { | ||
echo "$1" >"$1.file" && | ||
git add "$1.file" && | ||
test_tick && | ||
git commit -m "$1" | ||
} | ||
|
||
test_expect_success setup ' | ||
test_commit A && | ||
test_commit B && | ||
test_commit C && | ||
git checkout -b side HEAD^ && | ||
test_commit D && | ||
test_commit E && | ||
git merge master | ||
' | ||
|
||
test_expect_success 'rev-list --first-parent --boundary' ' | ||
git rev-list --first-parent --boundary HEAD^.. | ||
' | ||
|
||
test_done |