Skip to content

Commit cdc986a

Browse files
committed
Revert "commit-graph: when incompatible with graphs, indicate why"
This reverts commit c85eec7, as it is a bit overzealous, we are in prerelease freeze, and we want to have enough time to get this right and cook in 'next'. cf. <[email protected]>
1 parent c85eec7 commit cdc986a

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
@@ -205,24 +205,16 @@ static int commit_graph_compatible(struct repository *r)
205205

206206
if (read_replace_refs) {
207207
prepare_replace_object(r);
208-
if (hashmap_get_size(&r->objects->replace_map->map)) {
209-
warning(_("repository contains replace objects; "
210-
"skipping commit-graph"));
208+
if (hashmap_get_size(&r->objects->replace_map->map))
211209
return 0;
212-
}
213210
}
214211

215212
prepare_commit_graft(r);
216213
if (r->parsed_objects &&
217-
(r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent)) {
218-
warning(_("repository contains (deprecated) grafts; "
219-
"skipping commit-graph"));
214+
(r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent))
220215
return 0;
221-
}
222-
if (is_repository_shallow(r)) {
223-
warning(_("repository is shallow; skipping commit-graph"));
216+
if (is_repository_shallow(r))
224217
return 0;
225-
}
226218

227219
return 1;
228220
}

0 commit comments

Comments
 (0)