mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Simon Gerber via GitGitGadget" <>
Cc: Simon Gerber <>, Simon Gerber <>
Subject: [PATCH 2/2] help.c: don't call git_default_config in git_unknown_cmd_config
Date: Fri, 28 Oct 2022 15:24:05 +0000	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

From: Simon Gerber <>

Currently, auto correction doesn't work reliably for commands which must
run in a work tree (e.g. `git status`) in Git work trees which are
created from a bare repository.

As far as I'm able to determine, this has been broken since commit
659fef199f (help: use early config when autocorrecting aliases,
2017-06-14), where the call to `git_config()` in `help_unknown_cmd()`
was replaced with a call to `read_early_config()`. From what I can tell,
the actual cause for the unexpected error is that we call
`git_default_config()` in the `git_unknown_cmd_config` callback instead
of simply returning `0` for config entries which we aren't interested

Calling `git_default_config()` in this callback to `read_early_config()`
seems like a bad idea since those calls will initialize a bunch of state
in `environment.c` (among other things `is_bare_repository_cfg`) before
we've properly detected that we're running in a work tree.

All other callbacks provided to `read_early_config()` appear to only
extract their configurations while simply returning `0` for all other
config keys.

This commit changes the `git_unknown_cmd_config` callback to not call
`git_default_config()`. Instead we also simply return `0` for config
keys which we're not interested in.

Signed-off-by: Simon Gerber <>
 help.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/help.c b/help.c
index d04542d8261..ae534ff0bae 100644
--- a/help.c
+++ b/help.c
@@ -563,7 +563,7 @@ static int git_unknown_cmd_config(const char *var, const char *value, void *cb)
 	if (skip_prefix(var, "alias.", &p))
 		add_cmdname(&aliases, p, strlen(p));
-	return git_default_config(var, value, cb);
+	return 0;
 static int levenshtein_compare(const void *p1, const void *p2)

  parent reply	other threads:[~2022-10-28 15:24 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-28 15:24 [PATCH 0/2] Fix autocorrect in work tree for bare repository Simon Gerber via GitGitGadget
2022-10-28 15:24 ` [PATCH 1/2] tests: add test case for autocorrect in work tree for bare clone Simon Gerber via GitGitGadget
2022-10-28 19:28   ` Junio C Hamano
2022-10-29  8:07     ` Simon Gerber
2022-10-28 15:24 ` Simon Gerber via GitGitGadget [this message]
2022-10-29 19:56 ` [PATCH v2] help.c: fix autocorrect in work tree for bare repository Simon Gerber via GitGitGadget
2022-12-12 16:38   ` Simon Gerber
2022-12-13  1:37   ` Junio C Hamano
2022-12-13  9:48     ` Simon Gerber

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* 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

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