From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 3 Apr 2011 19:32:35 +0000 (-0700)
Subject: Merge branch 'jc/maint-rev-list-culled-boundary' into maint
X-Git-Tag: v1.7.4.4~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3967c995eed9f4046a1dde5ef520d1dbcdedfab8;p=git.git

Merge branch 'jc/maint-rev-list-culled-boundary' into maint

* jc/maint-rev-list-culled-boundary:
  list-objects.c: don't add an unparsed NULL as a pending tree

Conflicts:
	list-objects.c
---

3967c995eed9f4046a1dde5ef520d1dbcdedfab8
diff --cc list-objects.c
index 8953548c0,518c6650e..44fa5a92e
--- a/list-objects.c
+++ b/list-objects.c
@@@ -148,8 -147,13 +148,13 @@@ void traverse_commit_list(struct rev_in
  	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);
 +		show_commit(commit, data);
  	}
  	for (i = 0; i < revs->pending.nr; i++) {
  		struct object_array_entry *pending = revs->pending.objects + i;