Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-14 22:29:50 +0300
committerJunio C Hamano <gitster@pobox.com>2011-03-14 22:33:58 +0300
commit6e7d0efa9058aa61147d9d18b33bd046055584e4 (patch)
tree5dbf761777e72b22754887370aff3927f82ca200 /t/t6110-rev-list-sparse.sh
parent8d2dfc49b199c7da6faefd7993630f24bd37fee0 (diff)
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 't/t6110-rev-list-sparse.sh')
-rwxr-xr-xt/t6110-rev-list-sparse.sh27
1 files changed, 27 insertions, 0 deletions
diff --git a/t/t6110-rev-list-sparse.sh b/t/t6110-rev-list-sparse.sh
new file mode 100755
index 0000000000..2a267e84cd
--- /dev/null
+++ b/t/t6110-rev-list-sparse.sh
@@ -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