Skip to content

Commit c0b27e3

Browse files
committed
Merge branch 'js/commit-graph-warning'
* js/commit-graph-warning: Revert "commit-graph: when incompatible with graphs, indicate why"
2 parents 225365f + cdc986a commit c0b27e3

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

commit-graph.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -215,24 +215,16 @@ static int commit_graph_compatible(struct repository *r)
215215

216216
if (read_replace_refs) {
217217
prepare_replace_object(r);
218-
if (hashmap_get_size(&r->objects->replace_map->map)) {
219-
warning(_("repository contains replace objects; "
220-
"skipping commit-graph"));
218+
if (hashmap_get_size(&r->objects->replace_map->map))
221219
return 0;
222-
}
223220
}
224221

225222
prepare_commit_graft(r);
226223
if (r->parsed_objects &&
227-
(r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent)) {
228-
warning(_("repository contains (deprecated) grafts; "
229-
"skipping commit-graph"));
224+
(r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent))
230225
return 0;
231-
}
232-
if (is_repository_shallow(r)) {
233-
warning(_("repository is shallow; skipping commit-graph"));
226+
if (is_repository_shallow(r))
234227
return 0;
235-
}
236228

237229
return 1;
238230
}

0 commit comments

Comments
 (0)