Merge branch 'ab/commit-graph-write-optim'
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2019 22:26:14 +0000 (14:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2019 22:26:14 +0000 (14:26 -0800)
The codepath to write out commit-graph has been optimized by
following the usual pattern of visiting objects in in-pack order.

* ab/commit-graph-write-optim:
  commit-graph write: use pack order when finding commits

commit-graph.c

index 18bd2b6..8d52727 100644 (file)
@@ -859,7 +859,8 @@ void write_commit_graph(const char *obj_dir,
                                die(_("error adding pack %s"), packname.buf);
                        if (open_pack_index(p))
                                die(_("error opening index for %s"), packname.buf);
-                       for_each_object_in_pack(p, add_packed_commits, &oids, 0);
+                       for_each_object_in_pack(p, add_packed_commits, &oids,
+                                               FOR_EACH_OBJECT_PACK_ORDER);
                        close_pack(p);
                        free(p);
                }
@@ -897,7 +898,8 @@ void write_commit_graph(const char *obj_dir,
                if (report_progress)
                        oids.progress = start_delayed_progress(
                                _("Finding commits for commit graph"), 0);
-               for_each_packed_object(add_packed_commits, &oids, 0);
+               for_each_packed_object(add_packed_commits, &oids,
+                                      FOR_EACH_OBJECT_PACK_ORDER);
                stop_progress(&oids.progress);
        }