From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Nov 2018 09:23:57 +0000 (+0900)
Subject: Merge branch 'js/config-sequence'
X-Git-Tag: v2.20.0-rc0~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/744fad66c933ad5740e5f974a841d15c65d0246d?hp=06a2d241cf7c0efb91960875715c4d3241f4dbff

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

diff --git a/config.c b/config.c
index 2ffd39c220..04286f7717 100644
--- a/config.c
+++ b/config.c
@@ -1668,6 +1668,8 @@ 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)
+		BUG("git_dir without commondir");
 	else
 		repo_config = NULL;