mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-23 16:06:38 +02:00
Code

Merge branch 'js/commit-graph-warning' 

* js/commit-graph-warning:
  Revert "commit-graph: when incompatible with graphs, indicate why"
This commit is contained in:
Junio C Hamano 2021-03-01 09:21:24 -08:00
parent 225365fb51 cdc986a7c2
commit c0b27e3964
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
commit-graph.c
View File

@ -215,24 +215,16 @@ static int commit_graph_compatible(struct repository *r)
if (read_replace_refs) {
prepare_replace_object(r);
if (hashmap_get_size(&r->objects->replace_map->map)) {
warning(_("repository contains replace objects; "
"skipping commit-graph"));
if (hashmap_get_size(&r->objects->replace_map->map))
return 0;
}
}
prepare_commit_graft(r);
if (r->parsed_objects &&
(r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent)) {
warning(_("repository contains (deprecated) grafts; "
"skipping commit-graph"));
(r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent))
return 0;
}
if (is_repository_shallow(r)) {
warning(_("repository is shallow; skipping commit-graph"));
if (is_repository_shallow(r))
return 0;
}
return 1;
}