From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Mar 2021 17:19:37 +0000 (-0800)
Subject: Revert "commit-graph: when incompatible with graphs, indicate why"
X-Git-Tag: v2.31.0-rc1~12^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdc986a7c2e86fde9e7945bbc40335f7ab2a7c5e;p=thirdparty%2Fgit.git

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>
---

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;
 }