diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-01 18:19:37 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-01 18:19:37 +0100 |
| commit | cdc986a7c2e86fde9e7945bbc40335f7ab2a7c5e (patch) | |
| tree | dd6a0eaf8ee41a274bfc150b93d66cbf6a6cc23a /commit-graph.c | |
| parent | commit-graph: when incompatible with graphs, indicate why (diff) | |
| download | git-cdc986a7c2e86fde9e7945bbc40335f7ab2a7c5e.tar.xz git-cdc986a7c2e86fde9e7945bbc40335f7ab2a7c5e.zip | |
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>
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/commit-graph.c b/commit-graph.c index 8fd4804343..031641014f 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -205,24 +205,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; } |