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 <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-11-19 11:09:08 +01:00
parent c557886ed7
commit b8591e07fd

View File

@@ -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;