summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-03-20 18:03:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-21 02:52:11 (GMT)
commit83b0ecf333e518867935f6b12c18294a8a7f5017 (patch)
treeb1cd4afb3ce2e87a00ac59f8b148ce78ca0f83e4 /git.c
parent0e94f7aa730b108f7907cfab1b2a7fba965de442 (diff)
downloadgit-83b0ecf333e518867935f6b12c18294a8a7f5017.zip
git-83b0ecf333e518867935f6b12c18294a8a7f5017.tar.gz
git-83b0ecf333e518867935f6b12c18294a8a7f5017.tar.bz2
git: read local config in --list-cmds
Normally code that is checking config before we've decided to do setup_git_directory() would use read_early_config(), which uses discover_git_directory() to tentatively see if we're in a repo, and if so to add it to the config sequence. But list_cmds() uses the caching configset mechanism which rightly does not use read_early_config(), because it has no idea if it's being called early. Call setup_git_directory_gently() so we can pick up repo-level config (like completion.commands). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r--git.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/git.c b/git.c
index 2014aab..181785e 100644
--- a/git.c
+++ b/git.c
@@ -62,6 +62,13 @@ static int list_cmds(const char *spec)
{
struct string_list list = STRING_LIST_INIT_DUP;
int i;
+ int nongit;
+
+ /*
+ * Set up the repository so we can pick up any repo-level config (like
+ * completion.commands).
+ */
+ setup_git_directory_gently(&nongit);
while (*spec) {
const char *sep = strchrnul(spec, ',');