mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-11 12:19:40 +01:00
Code

Merge branch 'js/commit-graph-warning'

Browse Source 
* 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
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) { if (read_replace_refs) {
prepare_replace_object(r); prepare_replace_object(r);
if (hashmap_get_size(&r->objects->replace_map->map)) { if (hashmap_get_size(&r->objects->replace_map->map))
warning(_("repository contains replace objects; "
"skipping commit-graph"));
return 0; return 0;
} }
}
prepare_commit_graft(r); prepare_commit_graft(r);
if (r->parsed_objects && if (r->parsed_objects &&
(r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent)) { (r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent))
warning(_("repository contains (deprecated) grafts; "
"skipping commit-graph"));
return 0; return 0;
} if (is_repository_shallow(r))
if (is_repository_shallow(r)) {
warning(_("repository is shallow; skipping commit-graph"));
return 0; return 0;
}
return 1; return 1;
} }