Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
commit-graph: not compatible with grafts
[gitweb.git]
/
commit-graph.c
diff --git
a/commit-graph.c
b/commit-graph.c
index 2c01fa433f3d32c653b9c06f248fac58fece5262..c4eaedf4e5448075d2db678ea9e13e58bdb514e9 100644
(file)
--- a/
commit-graph.c
+++ b/
commit-graph.c
@@
-68,6
+68,12
@@
static int commit_graph_compatible(struct repository *r)
return 0;
}
+ prepare_commit_graft(r);
+ if (r->parsed_objects && r->parsed_objects->grafts_nr)
+ return 0;
+ if (is_repository_shallow(r))
+ return 0;
+
return 1;
}