diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-01 17:21:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-01 17:21:24 (GMT) |
| commit | c0b27e3964b3300969660119fe12a863cfcae912 (patch) | |
| tree | 959fafa3e1401b435bde38ccfb36ac6dcf69bcb5 | |
| parent | 225365fb5195e804274ab569ac3cc4919451dc7f (diff) | |
| parent | cdc986a7c2e86fde9e7945bbc40335f7ab2a7c5e (diff) | |
| download | git-c0b27e3964b3300969660119fe12a863cfcae912.zip git-c0b27e3964b3300969660119fe12a863cfcae912.tar.gz git-c0b27e3964b3300969660119fe12a863cfcae912.tar.bz2 | |
Merge branch 'js/commit-graph-warning'
* js/commit-graph-warning:
Revert "commit-graph: when incompatible with graphs, indicate why"
| -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 7a5f15b..c6768bb 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -215,24 +215,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; } |