diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-03-22 21:37:59 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-03-22 21:37:59 -0700 |
commit | 4b28cd9f2fb755cdfe1b97130e84644ae932988c (patch) | |
tree | c48bc072cd6d6d6b27f4bf1e38c2481bb6a4ace6 /t/t6110-rev-list-sparse.sh | |
parent | 91b3c7ce8e189b90d3203265c9625806a15045e1 (diff) | |
parent | 6e7d0efa9058aa61147d9d18b33bd046055584e4 (diff) | |
download | git-4b28cd9f2fb755cdfe1b97130e84644ae932988c.tar.gz |
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
Diffstat (limited to 't/t6110-rev-list-sparse.sh')
-rwxr-xr-x | t/t6110-rev-list-sparse.sh | 20 |
1 files changed, 20 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..656ac7fe9d --- /dev/null +++ b/t/t6110-rev-list-sparse.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +test_description='operations that cull histories in unusual ways' +. ./test-lib.sh + +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 |