Merge branch 'js/config-sequence'

A sanity check for start-up sequence has been added in the config
API codepath.

* js/config-sequence:
  config: report a bug if git_dir exists without commondir
This commit is contained in:
Junio C Hamano 2018-11-18 18:23:57 +09:00
commit 744fad66c9

View File

@ -1668,6 +1668,8 @@ static int do_git_config_sequence(const struct config_options *opts,
if (opts->commondir) if (opts->commondir)
repo_config = mkpathdup("%s/config", opts->commondir); repo_config = mkpathdup("%s/config", opts->commondir);
else if (opts->git_dir)
BUG("git_dir without commondir");
else else
repo_config = NULL; repo_config = NULL;