Re: [PATCH] advice: use global config for default branch name
On Wed, Sep 09, 2026 at 09:23:19PM -0700, Junio C Hamano wrote:
Show 22 quoted lines
> Surely, and I think we are pretty much on the same page. Such a
> mechanical rewrite is not too bad. Here is what I came up with:
>
> $ edit tools/coccinelle/advice.cocci
> $ make coccicheck
> $ git add -N tools/coccinelle/advice.cocci
> $ git apply .build/tools/coccinelle/ALL.cocci.patch
> $ git add -p
>
> Some of the hunks I simply accepted with (y), but most of them
> needed (e)dit to make them presentable; otherwise we ended up
> with too many overly long lines.
>
>
> tools/coccinelle/advice.cocci | 7 +++++++
> advice.c | 13 ++++---------
> branch.c | 6 +++---
> builtin/am.c | 4 ++--
> builtin/checkout.c | 4 ++--
> builtin/submodule--helper.c | 4 ++--
> sequencer.c | 9 ++++-----
> 7 files changed, 24 insertions(+), 23 deletions(-)
This misses a few that have more complex conditionals like:
diff --git a/commit.c b/commit.c
index ad26f0b40a..5eedad6a2c 100644
--- a/commit.c
+++ b/commit.c
@@ -290,9 +290,9 @@ static int read_graft_file(struct repository *r, const char *graft_file)
struct strbuf buf = STRBUF_INIT;
if (!fp)
return -1;
- if (!no_graft_file_deprecated_advice &&
- advice_enabled(ADVICE_GRAFT_FILE_DEPRECATED))
- advise(_("Support for <GIT_DIR>/info/grafts is deprecated\n"
+ if (!no_graft_file_deprecated_advice)
+ advise_if_enabled(ADVICE_GRAFT_FILE_DEPRECATED,
+ _("Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\n"
"Please use \"git replace --convert-graft-file\"\n"
But I think the bigger question remains: if we did this, would people
find the extra lines giving the turn-off instructions ugly/overwhelming?
I'm not sure.
-Peff
Jeff King <peff@peff.net>