diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:32:35 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:32:35 -0700 |
commit | 3967c995eed9f4046a1dde5ef520d1dbcdedfab8 (patch) | |
tree | 3d4d615a457d845a3b0dd15f6b4d3ad4dc5d3f60 /t | |
parent | 1030536153db404daba4a140d1e3fa1a7ba470a5 (diff) | |
parent | 6e7d0efa9058aa61147d9d18b33bd046055584e4 (diff) | |
download | git-3967c995eed9f4046a1dde5ef520d1dbcdedfab8.tar.gz git-3967c995eed9f4046a1dde5ef520d1dbcdedfab8.tar.xz |
Merge branch 'jc/maint-rev-list-culled-boundary' into maint
* jc/maint-rev-list-culled-boundary:
list-objects.c: don't add an unparsed NULL as a pending tree
Conflicts:
list-objects.c
Diffstat (limited to 't')
-rwxr-xr-x | t/t6110-rev-list-sparse.sh | 27 |
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 000000000..2a267e84c --- /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 |