summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-08 06:59:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-08 06:59:20 (GMT)
commitb10edb2df55241b2e042b3d5473537904d09d193 (patch)
tree0e456f3d65f1268c364a8d6d2b463456f23e222a /commit.c
parent4f4d0b42bae8091fd989aa6d7db72ecdd86aa36b (diff)
parent7547b95b4fbb8591726b1d9381c176cc27fc6aea (diff)
downloadgit-b10edb2df55241b2e042b3d5473537904d09d193.zip
git-b10edb2df55241b2e042b3d5473537904d09d193.tar.gz
git-b10edb2df55241b2e042b3d5473537904d09d193.tar.bz2
Merge branch 'ds/commit-graph'
Precompute and store information necessary for ancestry traversal in a separate file to optimize graph walking. * ds/commit-graph: commit-graph: implement "--append" option commit-graph: build graph from starting commits commit-graph: read only from specific pack-indexes commit: integrate commit graph with commit parsing commit-graph: close under reachability commit-graph: add core.commitGraph setting commit-graph: implement git commit-graph read commit-graph: implement git-commit-graph write commit-graph: implement write_commit_graph() commit-graph: create git-commit-graph builtin graph: add commit graph design document commit-graph: add format document csum-file: refactor finalize_hashfile() method csum-file: rename hashclose() to finalize_hashfile()
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/commit.c b/commit.c
index ca474a7..5704911 100644
--- a/commit.c
+++ b/commit.c
@@ -1,6 +1,7 @@
#include "cache.h"
#include "tag.h"
#include "commit.h"
+#include "commit-graph.h"
#include "pkt-line.h"
#include "utf8.h"
#include "diff.h"
@@ -383,6 +384,8 @@ int parse_commit_gently(struct commit *item, int quiet_on_missing)
return -1;
if (item->object.parsed)
return 0;
+ if (parse_commit_in_graph(item))
+ return 0;
buffer = read_object_file(&item->object.oid, &type, &size);
if (!buffer)
return quiet_on_missing ? -1 :