Merge branch 'jk/mark-edges-uninteresting'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:45:08 +0000 (10:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:45:08 +0000 (10:45 -0800)
Fix performance regression in v1.8.4.x and later.

* jk/mark-edges-uninteresting:
list-objects: only look at cmdline trees with edge_hint
t/perf: time rev-list with UNINTERESTING commits

1  2 
list-objects.c
diff --combined list-objects.c
index 6cbedf0280076d8fe6e49241d89938955ecddead,8b39b50c22f6a83f700313790d0b94ced71d35bb..206816fa9c47eb419775bcf2005f9cd5144bc297
@@@ -123,7 -123,8 +123,7 @@@ static void process_tree(struct rev_inf
                                     cb_data);
        }
        strbuf_setlen(base, baselen);
 -      free(tree->buffer);
 -      tree->buffer = NULL;
 +      free_tree_buffer(tree);
  }
  
  static void mark_edge_parents_uninteresting(struct commit *commit,
@@@ -162,15 -163,17 +162,17 @@@ void mark_edges_uninteresting(struct re
                }
                mark_edge_parents_uninteresting(commit, revs, show_edge);
        }
-       for (i = 0; i < revs->cmdline.nr; i++) {
-               struct object *obj = revs->cmdline.rev[i].item;
-               struct commit *commit = (struct commit *)obj;
-               if (obj->type != OBJ_COMMIT || !(obj->flags & UNINTERESTING))
-                       continue;
-               mark_tree_uninteresting(commit->tree);
-               if (revs->edge_hint && !(obj->flags & SHOWN)) {
-                       obj->flags |= SHOWN;
-                       show_edge(commit);
+       if (revs->edge_hint) {
+               for (i = 0; i < revs->cmdline.nr; i++) {
+                       struct object *obj = revs->cmdline.rev[i].item;
+                       struct commit *commit = (struct commit *)obj;
+                       if (obj->type != OBJ_COMMIT || !(obj->flags & UNINTERESTING))
+                               continue;
+                       mark_tree_uninteresting(commit->tree);
+                       if (!(obj->flags & SHOWN)) {
+                               obj->flags |= SHOWN;
+                               show_edge(commit);
+                       }
                }
        }
  }