diff options
| -rw-r--r-- | list-objects.c | 7 | ||||
| -rwxr-xr-x | t/t6110-rev-list-sparse.sh | 27 |
2 files changed, 33 insertions, 1 deletions
diff --git a/list-objects.c b/list-objects.c index 5a4af62bd..518c6650e 100644 --- a/list-objects.c +++ b/list-objects.c @@ -147,7 +147,12 @@ void traverse_commit_list(struct rev_info *revs, struct commit *commit; while ((commit = get_revision(revs)) != NULL) { - add_pending_tree(revs, commit->tree); + /* + * an uninteresting boundary commit may not have its tree + * parsed yet, but we are not going to show them anyway + */ + if (commit->tree) + add_pending_tree(revs, commit->tree); show_commit(commit); } for (i = 0; i < revs->pending.nr; i++) { 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 |