]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Revert "commit-graph: when incompatible with graphs, indicate why"
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Mar 2021 17:19:37 +0000 (09:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Mar 2021 17:19:37 +0000 (09:19 -0800)
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>

commit-graph.c

index 8fd480434353806f0b8b96b84eab705e9e91355d..031641014faacfbefb288b88a670c6716566aa2a 100644 (file)
@@ -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;
 }