From b8591e07fde134fc07daa75fb545c77448f0ae29 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 19 Nov 2018 11:09:08 +0100 Subject: [PATCH] fixup! do_git_config_sequence(): fall back to git_dir if commondir is NULL In preparation for applying the latest iteration of bw/config-h that was submitted to the Git mailing list, let's revert the original iteration. Signed-off-by: Johannes Schindelin --- config.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/config.c b/config.c index eb67c9b9cc..3461993f0a 100644 --- a/config.c +++ b/config.c @@ -1676,8 +1676,6 @@ static int do_git_config_sequence(const struct config_options *opts, if (opts->commondir) repo_config = mkpathdup("%s/config", opts->commondir); - else if (opts->git_dir) - repo_config = mkpathdup("%s/config", opts->git_dir); else repo_config = NULL;