From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Derrick Stolee <dstolee@microsoft.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH] commit-graph: when incompatible with graphs, indicate why
Date: Thu, 11 Feb 2021 15:39:13 +0000 [thread overview]
Message-ID: <pull.875.git.1613057954213.gitgitgadget@gmail.com> (raw)
From: Johannes Schindelin <johannes.schindelin@gmx.de>
When `gc.writeCommitGraph = true`, it is possible that the commit-graph
is _still_ not written: replace objects, grafts and shallow repositories
are incompatible with the commit-graph feature.
Under such circumstances, we need to indicate to the user why the
commit-graph was not written instead of staying silent about it.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Be clear why commit-graph was skipped
After repairing my local checkout
[https://github.com/gitgitgadget/git/pull/873], I was puzzled that the
commit-graph file was not written. Turns out that I still had almost a
dozen replace objects. But I only found out that they were blocking the
commit-graph when I stepped through git gc in a debugger. This is my
attempt to make it more straight-forward to recover from similar
situations in the future.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-875%2Fdscho%2Fwarn-if-commit-graph-is-skipped-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-875/dscho/warn-if-commit-graph-is-skipped-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/875
commit-graph.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/commit-graph.c b/commit-graph.c
index 65410602714e..9ad176fa7c8e 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -205,16 +205,24 @@ 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))
+ if (hashmap_get_size(&r->objects->replace_map->map)) {
+ warning(_("repository contains replace objects; "
+ "skipping commit-graph"));
return 0;
+ }
}
prepare_commit_graft(r);
if (r->parsed_objects &&
- (r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent))
+ (r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent)) {
+ warning(_("repository contains (deprecated) grafts; "
+ "skipping commit-graph"));
return 0;
- if (is_repository_shallow(r))
+ }
+ if (is_repository_shallow(r)) {
+ warning(_("repository is shallow; skipping commit-graph"));
return 0;
+ }
return 1;
}
base-commit: f9f2520108bab26a750bcbb00518dc27672cf0a2
--
gitgitgadget
next reply other threads:[~2021-02-11 15:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-11 15:39 Johannes Schindelin via GitGitGadget [this message]
2021-02-11 16:17 ` [PATCH] commit-graph: when incompatible with graphs, indicate why Derrick Stolee
2021-02-11 17:32 ` Junio C Hamano
2021-02-25 14:07 ` noisy "warning: repository contains (deprecated) grafts; skipping commit-graph" warnings Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.875.git.1613057954213.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).