Code

Merge branch 'jc/maint-rev-list-culled-boundary' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 19:32:35 +0000 (12:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 19:32:35 +0000 (12:32 -0700)
* jc/maint-rev-list-culled-boundary:
  list-objects.c: don't add an unparsed NULL as a pending tree

Conflicts:
list-objects.c

1  2 
list-objects.c

diff --cc list-objects.c
index 8953548c07bb36f20798c7ca344d07960c22618c,518c6650e1827567be48976138aff621dc50eb92..44fa5a92e29815cbee54f9954c2ceac8e1262811
@@@ -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;