Permalink
Browse files

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
  • Loading branch information...
2 parents 91b3c7c + 6e7d0ef commit 4b28cd9f2fb755cdfe1b97130e84644ae932988c @gitster gitster committed Mar 23, 2011
Showing with 26 additions and 1 deletion.
  1. +6 −1 list-objects.c
  2. +20 −0 t/t6110-rev-list-sparse.sh
View
@@ -173,7 +173,12 @@ void traverse_commit_list(struct rev_info *revs,
strbuf_init(&base, PATH_MAX);
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++) {
@@ -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

0 comments on commit 4b28cd9

Please sign in to comment.