Revert "commit-graph: when incompatible with graphs, indicate why"
This reverts commit c85eec7fc37e1ca79072f263ae6ea1ee305ba38c, 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. <8735xgkvuo.fsf@evledraar.gmail.com>
Junio C Hamano committed
Mar 1, 2021 at 09:19 UTC
cdc986a7c2e86fde9e7945bbc40335f7ab2a7c5e
1 file changed
+3
-11
commit-graph.c
+3
-11
@@ -205,24 +205,16 @@ static int commit_graph_compatible(struct repository *r)
205
206
if (read_replace_refs) {
207
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))
209
return 0;
212
- }
210
}
211
212
prepare_commit_graft(r);
213
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))
215
return 0;
221
- }
222
- if (is_repository_shallow(r)) {
223
- warning(_("repository is shallow; skipping commit-graph"));
216
+ if (is_repository_shallow(r))
217
return 0;
225
- }
218
219
return 1;
220
}