From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Mar 2011 04:37:59 +0000 (-0700)
Subject: Merge branch 'jc/maint-rev-list-culled-boundary'
X-Git-Tag: v1.7.5-rc0~43
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4b28cd9f2fb755cdfe1b97130e84644ae932988c;p=git.git

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
---

4b28cd9f2fb755cdfe1b97130e84644ae932988c
diff --cc list-objects.c
index 61f6cc98d,518c6650e..838b6a732
--- a/list-objects.c
+++ b/list-objects.c
@@@ -169,12 -145,15 +169,17 @@@ void traverse_commit_list(struct rev_in
  {
  	int i;
  	struct commit *commit;
 +	struct strbuf base;
  
 +	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);
 +		show_commit(commit, data);
  	}
  	for (i = 0; i < revs->pending.nr; i++) {
  		struct object_array_entry *pending = revs->pending.objects + i;
diff --cc t/t6110-rev-list-sparse.sh
index 000000000,2a267e84c..656ac7fe9
mode 000000,100755..100755
--- a/t/t6110-rev-list-sparse.sh
+++ b/t/t6110-rev-list-sparse.sh
@@@ -1,0 -1,27 +1,20 @@@
+ #!/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