From 704f1f76339abfdaffa1847c93888cb0a288dd8f Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 30 Aug 2017 01:28:22 +0200
Subject: [PATCH] mingw: ensure that core.longPaths is handled *always*

A ton of Git commands simply do not read (or at least parse) the core.*
settings. This is not good, as Git for Windows relies on the
core.longPaths setting to be read quite early on.

So let's just make sure that all commands read the config and give
platform_core_config() a chance.

This patch teaches tons of Git commands to respect the config setting
`core.longPaths = true`, including `pack-refs`, thereby fixing
https://github.com/git-for-windows/git/issues/1218

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/archive.c            | 2 ++
 builtin/bisect--helper.c     | 2 ++
 builtin/bundle.c             | 2 ++
 builtin/check-ref-format.c   | 2 ++
 builtin/clone.c              | 2 ++
 builtin/column.c             | 2 ++
 builtin/credential.c         | 3 +++
 builtin/fetch-pack.c         | 3 +++
 builtin/get-tar-commit-id.c  | 2 ++
 builtin/interpret-trailers.c | 2 ++
 builtin/log.c                | 1 +
 builtin/ls-remote.c          | 2 ++
 builtin/mailinfo.c           | 2 ++
 builtin/mailsplit.c          | 2 ++
 builtin/merge-index.c        | 3 +++
 builtin/merge-tree.c         | 2 ++
 builtin/mktag.c              | 2 ++
 builtin/mktree.c             | 2 ++
 builtin/pack-refs.c          | 2 ++
 builtin/prune-packed.c       | 2 ++
 builtin/prune.c              | 3 +++
 builtin/reflog.c             | 1 +
 builtin/remote-ext.c         | 2 ++
 builtin/remote.c             | 1 +
 builtin/rev-parse.c          | 1 +
 builtin/send-pack.c          | 2 +-
 builtin/show-ref.c           | 2 ++
 builtin/stripspace.c         | 5 ++---
 builtin/submodule--helper.c  | 1 +
 builtin/upload-archive.c     | 3 +++
 credential-store.c           | 3 +++
 http-backend.c               | 1 +
 refs.c                       | 2 +-
 show-index.c                 | 2 ++
 34 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/builtin/archive.c b/builtin/archive.c
index f863465a0fa137..b086ab06d665b2 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -9,6 +9,7 @@
 #include "parse-options.h"
 #include "pkt-line.h"
 #include "sideband.h"
+#include "config.h"
 
 static void create_output_file(const char *output_file)
 {
@@ -94,6 +95,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 
+	git_config(git_default_config, NULL);
 	argc = parse_options(argc, argv, prefix, local_opts, NULL,
 			     PARSE_OPT_KEEP_ALL);
 
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 3324229025300f..185a58f8b2039b 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -2,6 +2,7 @@
 #include "cache.h"
 #include "parse-options.h"
 #include "bisect.h"
+#include "config.h"
 
 static const char * const git_bisect_helper_usage[] = {
 	N_("git bisect--helper --next-all [--no-checkout]"),
@@ -20,6 +21,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 
+	git_config(git_default_config, NULL);
 	argc = parse_options(argc, argv, prefix, options,
 			     git_bisect_helper_usage, 0);
 
diff --git a/builtin/bundle.c b/builtin/bundle.c
index d0de59b94ff23e..da8c94123fefe9 100644
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -1,6 +1,7 @@
 #include "builtin.h"
 #include "cache.h"
 #include "bundle.h"
+#include "config.h"
 
 /*
  * Basic handler for bundle files to connect repositories via sneakernet.
@@ -21,6 +22,7 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
 	const char *cmd, *bundle_file;
 	int bundle_fd = -1;
 
+	git_config(git_default_config, NULL);
 	if (argc < 3)
 		usage(builtin_bundle_usage);
 
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index eac499450f6355..8535db2204aa35 100644
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -6,6 +6,7 @@
 #include "refs.h"
 #include "builtin.h"
 #include "strbuf.h"
+#include "config.h"
 
 static const char builtin_check_ref_format_usage[] =
 "git check-ref-format [--normalize] [<options>] <refname>\n"
@@ -55,6 +56,7 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
 	int flags = 0;
 	const char *refname;
 
+	git_config(git_default_config, NULL);
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage(builtin_check_ref_format_usage);
 
diff --git a/builtin/clone.c b/builtin/clone.c
index 1de6b1c5556935..548dbe975a99a8 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -885,6 +885,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	struct refspec *refspec;
 	const char *fetch_pattern;
 
+	git_config(platform_core_config, NULL);
+
 	packet_trace_identity("clone");
 	argc = parse_options(argc, argv, prefix, builtin_clone_options,
 			     builtin_clone_usage, 0);
diff --git a/builtin/column.c b/builtin/column.c
index 0c3223d64b1595..0f0dab56bc95bb 100644
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -34,6 +34,8 @@ int cmd_column(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 
+	git_config(platform_core_config, NULL);
+
 	/* This one is special and must be the first one */
 	if (argc > 1 && starts_with(argv[1], "--command=")) {
 		command = argv[1] + 10;
diff --git a/builtin/credential.c b/builtin/credential.c
index 879acfbcda7514..d75dcdc64aa3c3 100644
--- a/builtin/credential.c
+++ b/builtin/credential.c
@@ -1,6 +1,7 @@
 #include "git-compat-util.h"
 #include "credential.h"
 #include "builtin.h"
+#include "config.h"
 
 static const char usage_msg[] =
 	"git credential [fill|approve|reject]";
@@ -10,6 +11,8 @@ int cmd_credential(int argc, const char **argv, const char *prefix)
 	const char *op;
 	struct credential c = CREDENTIAL_INIT;
 
+	git_config(git_default_config, NULL);
+
 	if (argc != 2 || !strcmp(argv[1], "-h"))
 		usage(usage_msg);
 	op = argv[1];
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 366b9d13f929b7..2c1c762a1fb3d9 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -4,6 +4,7 @@
 #include "remote.h"
 #include "connect.h"
 #include "sha1-array.h"
+#include "config.h"
 
 static const char fetch_pack_usage[] =
 "git fetch-pack [--all] [--stdin] [--quiet | -q] [--keep | -k] [--thin] "
@@ -53,6 +54,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
 	struct oid_array shallow = OID_ARRAY_INIT;
 	struct string_list deepen_not = STRING_LIST_INIT_DUP;
 
+	git_config(git_default_config, NULL);
+
 	packet_trace_identity("fetch-pack");
 
 	memset(&args, 0, sizeof(args));
diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c
index e21c5416cd478e..b6bb7536b44b8e 100644
--- a/builtin/get-tar-commit-id.c
+++ b/builtin/get-tar-commit-id.c
@@ -6,6 +6,7 @@
 #include "tar.h"
 #include "builtin.h"
 #include "quote.h"
+#include "config.h"
 
 static const char builtin_get_tar_commit_id_usage[] =
 "git get-tar-commit-id";
@@ -25,6 +26,7 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix)
 	if (argc != 1)
 		usage(builtin_get_tar_commit_id_usage);
 
+	git_config(git_default_config, NULL);
 	n = read_in_full(0, buffer, HEADERSIZE);
 	if (n < HEADERSIZE)
 		die("git get-tar-commit-id: read error");
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index 175f14797b101d..692eb90f0cf0ca 100644
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -10,6 +10,7 @@
 #include "parse-options.h"
 #include "string-list.h"
 #include "trailer.h"
+#include "config.h"
 
 static const char * const git_interpret_trailers_usage[] = {
 	N_("git interpret-trailers [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]"),
@@ -30,6 +31,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 
+	git_config(git_default_config, NULL);
 	argc = parse_options(argc, argv, prefix, options,
 			     git_interpret_trailers_usage, 0);
 
diff --git a/builtin/log.c b/builtin/log.c
index 5ffc380bd71f0a..ad8121a600302c 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1881,6 +1881,7 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 
+	git_config(git_default_config, NULL);
 	argc = parse_options(argc, argv, prefix, options, cherry_usage, 0);
 
 	switch (argc) {
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index c4be98ab9e84fd..52a7bcc23c6ec1 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -2,6 +2,7 @@
 #include "cache.h"
 #include "transport.h"
 #include "remote.h"
+#include "config.h"
 
 static const char * const ls_remote_usage[] = {
 	N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -71,6 +72,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 			     PARSE_OPT_STOP_AT_NON_OPTION);
 	dest = argv[0];
 
+	git_config(git_default_config, NULL);
 	if (argc > 1) {
 		int i;
 		pattern = xcalloc(argc, sizeof(const char *));
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index cfb667a594c845..150fe3d942371d 100644
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -7,6 +7,7 @@
 #include "utf8.h"
 #include "strbuf.h"
 #include "mailinfo.h"
+#include "config.h"
 
 static const char mailinfo_usage[] =
 	"git mailinfo [-k | -b] [-m | --message-id] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] <msg> <patch> < mail >info";
@@ -18,6 +19,7 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
 	int status;
 	char *msgfile, *patchfile;
 
+	git_config(git_default_config, NULL);
 	setup_mailinfo(&mi);
 
 	def_charset = get_commit_output_encoding();
diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 664400b8169b67..472d2eb8a4d6f7 100644
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -8,6 +8,7 @@
 #include "builtin.h"
 #include "string-list.h"
 #include "strbuf.h"
+#include "config.h"
 
 static const char git_mailsplit_usage[] =
 "git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [(<mbox>|<Maildir>)...]";
@@ -276,6 +277,7 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix)
 	const char **argp;
 	static const char *stdin_only[] = { "-", NULL };
 
+	git_config(git_default_config, NULL);
 	for (argp = argv+1; *argp; argp++) {
 		const char *arg = *argp;
 
diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index c99443b095bd8a..caaef0c03d7431 100644
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "run-command.h"
+#include "config.h"
 
 static const char *pgm;
 static int one_shot, quiet;
@@ -74,6 +75,8 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix)
 	 */
 	signal(SIGCHLD, SIG_DFL);
 
+	git_config(git_default_config, NULL);
+
 	if (argc < 3)
 		usage("git merge-index [-o] [-q] <merge-program> (-a | [--] [<filename>...])");
 
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index bad6735c76fd06..7017bf5f0667f2 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -4,6 +4,7 @@
 #include "blob.h"
 #include "exec_cmd.h"
 #include "merge-blobs.h"
+#include "config.h"
 
 static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";
 
@@ -366,6 +367,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
 	if (argc != 4)
 		usage(merge_tree_usage);
 
+	git_config(git_default_config, NULL);
 	buf1 = get_tree_descriptor(t+0, argv[1]);
 	buf2 = get_tree_descriptor(t+1, argv[2]);
 	buf3 = get_tree_descriptor(t+2, argv[3]);
diff --git a/builtin/mktag.c b/builtin/mktag.c
index 031b750f068dea..6556622215c6b9 100644
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "tag.h"
+#include "config.h"
 
 /*
  * A signature file has a very simple fixed format: four lines
@@ -156,6 +157,7 @@ int cmd_mktag(int argc, const char **argv, const char *prefix)
 	if (argc != 1)
 		usage("git mktag");
 
+	git_config(git_default_config, NULL);
 	if (strbuf_read(&buf, 0, 4096) < 0) {
 		die_errno("could not read from stdin");
 	}
diff --git a/builtin/mktree.c b/builtin/mktree.c
index da0fd8cd706659..ac2e619b43f56f 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -7,6 +7,7 @@
 #include "quote.h"
 #include "tree.h"
 #include "parse-options.h"
+#include "config.h"
 
 static struct treeent {
 	unsigned mode;
@@ -156,6 +157,7 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
 		OPT_END()
 	};
 
+	git_config(git_default_config, NULL);
 	ac = parse_options(ac, av, prefix, option, mktree_usage, 0);
 	getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
 
diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c
index b106a392a48157..ae2e0d0555978a 100644
--- a/builtin/pack-refs.c
+++ b/builtin/pack-refs.c
@@ -1,6 +1,7 @@
 #include "builtin.h"
 #include "parse-options.h"
 #include "refs.h"
+#include "config.h"
 
 static char const * const pack_refs_usage[] = {
 	N_("git pack-refs [<options>]"),
@@ -15,6 +16,7 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
 		OPT_BIT(0, "prune", &flags, N_("prune loose refs (default)"), PACK_REFS_PRUNE),
 		OPT_END(),
 	};
+	git_config(git_default_config, NULL);
 	if (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0))
 		usage_with_options(pack_refs_usage, opts);
 	return refs_pack_refs(get_main_ref_store(), flags);
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index ac978ad401c01c..51d80cf1b32d1e 100644
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -2,6 +2,7 @@
 #include "cache.h"
 #include "progress.h"
 #include "parse-options.h"
+#include "config.h"
 
 static const char * const prune_packed_usage[] = {
 	N_("git prune-packed [-n | --dry-run] [-q | --quiet]"),
@@ -59,6 +60,7 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 
+	git_config(git_default_config, NULL);
 	argc = parse_options(argc, argv, prefix, prune_packed_options,
 			     prune_packed_usage, 0);
 
diff --git a/builtin/prune.c b/builtin/prune.c
index c378690545b27b..8e016eaf473a89 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -6,6 +6,7 @@
 #include "reachable.h"
 #include "parse-options.h"
 #include "progress.h"
+#include "config.h"
 
 static const char * const prune_usage[] = {
 	N_("git prune [-n] [-v] [--expire <time>] [--] [<head>...]"),
@@ -111,6 +112,8 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 	};
 	char *s;
 
+	git_config(git_default_config, NULL);
+
 	expire = TIME_MAX;
 	save_commit_buffer = 0;
 	check_replace_refs = 0;
diff --git a/builtin/reflog.c b/builtin/reflog.c
index e237d927a0881b..3e321be342e550 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -728,6 +728,7 @@ static const char reflog_usage[] =
 
 int cmd_reflog(int argc, const char **argv, const char *prefix)
 {
+	git_config(git_default_config, NULL);
 	if (argc > 1 && !strcmp(argv[1], "-h"))
 		usage(reflog_usage);
 
diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c
index bfb21ba7d217ba..0872eb9067cd7d 100644
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -2,6 +2,7 @@
 #include "transport.h"
 #include "run-command.h"
 #include "pkt-line.h"
+#include "config.h"
 
 static const char usage_msg[] =
 	"git remote-ext <remote> <url>";
@@ -198,5 +199,6 @@ int cmd_remote_ext(int argc, const char **argv, const char *prefix)
 	if (argc != 3)
 		usage(usage_msg);
 
+	git_config(git_default_config, NULL);
 	return command_loop(argv[2]);
 }
diff --git a/builtin/remote.c b/builtin/remote.c
index 6273c0c23c904d..7588306def2e5c 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1599,6 +1599,7 @@ int cmd_remote(int argc, const char **argv, const char *prefix)
 	};
 	int result;
 
+	git_config(git_default_config, NULL);
 	argc = parse_options(argc, argv, prefix, options, builtin_remote_usage,
 		PARSE_OPT_STOP_AT_NON_OPTION);
 
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index c78b7b33d6604b..f0a352eb4a6b94 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -411,6 +411,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 	struct option *opts = NULL;
 	int onb = 0, osz = 0, unb = 0, usz = 0;
 
+	git_config(git_default_config, NULL);
 	strbuf_addstr(&parsed, "set --");
 	argc = parse_options(argc, argv, prefix, parseopt_opts, parseopt_usage,
 	                     PARSE_OPT_KEEP_DASHDASH);
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 633e0c3cdd3171..8abc6ee85b9f43 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -120,7 +120,7 @@ static int send_pack_config(const char *k, const char *v, void *cb)
 			}
 		}
 	}
-	return 0;
+	return git_default_config(k, v, cb);
 }
 
 int cmd_send_pack(int argc, const char **argv, const char *prefix)
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 013d241abc09be..be6b238a0e0321 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -5,6 +5,7 @@
 #include "tag.h"
 #include "string-list.h"
 #include "parse-options.h"
+#include "config.h"
 
 static const char * const show_ref_usage[] = {
 	N_("git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"),
@@ -180,6 +181,7 @@ static const struct option show_ref_options[] = {
 
 int cmd_show_ref(int argc, const char **argv, const char *prefix)
 {
+	git_config(git_default_config, NULL);
 	argc = parse_options(argc, argv, prefix, show_ref_options,
 			     show_ref_usage, 0);
 
diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index bdf032886912bb..f4b867efecac3e 100644
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@ -45,10 +45,9 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix)
 	if (argc)
 		usage_with_options(stripspace_usage, options);
 
-	if (mode == STRIP_COMMENTS || mode == COMMENT_LINES) {
+	if (mode == STRIP_COMMENTS || mode == COMMENT_LINES)
 		setup_git_directory_gently(NULL);
-		git_config(git_default_config, NULL);
-	}
+	git_config(git_default_config, NULL);
 
 	if (strbuf_read(&buf, 0, 1024) < 0)
 		die_errno("could not read the input");
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 895555c93a3bb8..0eca23e69cced6 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1253,6 +1253,7 @@ static struct cmd_struct commands[] = {
 int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
 {
 	int i;
+	git_config(git_default_config, NULL);
 	if (argc < 2 || !strcmp(argv[1], "-h"))
 		usage("git submodule--helper <command>");
 
diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index 84532ae9a93e7f..559515efb6b9d6 100644
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -8,6 +8,7 @@
 #include "sideband.h"
 #include "run-command.h"
 #include "argv-array.h"
+#include "config.h"
 
 static const char upload_archive_usage[] =
 	"git upload-archive <repo>";
@@ -28,6 +29,7 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
 	if (!enter_repo(argv[1], 0))
 		die("'%s' does not appear to be a git repository", argv[1]);
 
+	git_config(git_default_config, NULL);
 	/* put received options in sent_argv[] */
 	argv_array_push(&sent_argv, "git-upload-archive");
 	for (;;) {
@@ -76,6 +78,7 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
 {
 	struct child_process writer = { argv };
 
+	git_config(git_default_config, NULL);
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage(upload_archive_usage);
 
diff --git a/credential-store.c b/credential-store.c
index ac295420dd0d03..fbbdb006685dd3 100644
--- a/credential-store.c
+++ b/credential-store.c
@@ -3,6 +3,7 @@
 #include "credential.h"
 #include "string-list.h"
 #include "parse-options.h"
+#include "config.h"
 
 static struct lock_file credential_lock;
 
@@ -160,6 +161,8 @@ int cmd_main(int argc, const char **argv)
 
 	umask(077);
 
+	git_config(git_default_config, NULL);
+
 	argc = parse_options(argc, (const char **)argv, NULL, options, usage, 0);
 	if (argc != 1)
 		usage_with_options(usage, options);
diff --git a/http-backend.c b/http-backend.c
index 519025d2c3d944..1c5267a7c25b0b 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -700,6 +700,7 @@ int cmd_main(int argc, const char **argv)
 	setup_path();
 	if (!enter_repo(dir, 0))
 		not_found(&hdr, "Not a git repository: '%s'", dir);
+	git_config(git_default_config, NULL);
 	if (!getenv("GIT_HTTP_EXPORT_ALL") &&
 	    access("git-daemon-export-ok", F_OK) )
 		not_found(&hdr, "Repository not exported: '%s'", dir);
diff --git a/refs.c b/refs.c
index 6db7bf1f08ec2e..5930ac1da946fd 100644
--- a/refs.c
+++ b/refs.c
@@ -1165,7 +1165,7 @@ int parse_hide_refs_config(const char *var, const char *value, const char *secti
 		}
 		string_list_append(hide_refs, ref);
 	}
-	return 0;
+	return git_default_config(var, value, NULL);
 }
 
 int ref_is_hidden(const char *refname, const char *refname_full)
diff --git a/show-index.c b/show-index.c
index 1ead41e21131fc..447e3123804167 100644
--- a/show-index.c
+++ b/show-index.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "pack.h"
+#include "config.h"
 
 static const char show_index_usage[] =
 "git show-index";
@@ -13,6 +14,7 @@ int cmd_main(int argc, const char **argv)
 
 	if (argc != 1)
 		usage(show_index_usage);
+	git_config(git_default_config, NULL);
 	if (fread(top_index, 2 * 4, 1, stdin) != 1)
 		die("unable to read header");
 	if (top_index[0] == htonl(PACK_IDX_SIGNATURE)) {