Skip to content

Commit

Permalink
Merge branch 'jc/maint-rev-list-culled-boundary' into maint
Browse files Browse the repository at this point in the history
* jc/maint-rev-list-culled-boundary:
  list-objects.c: don't add an unparsed NULL as a pending tree

Conflicts:
	list-objects.c
  • Loading branch information
Junio C Hamano committed Apr 3, 2011
2 parents 1030536 + 6e7d0ef commit 3967c99
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
7 changes: 6 additions & 1 deletion list-objects.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,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, data);
}
for (i = 0; i < revs->pending.nr; i++) {
Expand Down
27 changes: 27 additions & 0 deletions t/t6110-rev-list-sparse.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 3967c99

Please sign in to comment.