mirror of
https://github.com/git/git.git
synced 2024-11-07 17:53:12 +01:00
6e7d0efa90
"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>
27 lines
485 B
Bash
Executable file
27 lines
485 B
Bash
Executable file
#!/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
|