setup_git_env: convert die("BUG") to BUG()

peff · gitster · commit 588a538ae554 · 2017-05-15T11:30:00.000+09:00
Converting to BUG() makes it easier to detect and debug
cases where we hit this assertion. Coupled with a new test
in t1300, this shows that the test suite can detect such
corner cases.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/environment.c b/environment.c
@@ -169,7 +169,7 @@ static void setup_git_env(void)
 	git_dir = getenv(GIT_DIR_ENVIRONMENT);
 	if (!git_dir) {
 		if (!startup_info->have_repository)
-			die("BUG: setup_git_env called without repository");
+			BUG("setup_git_env called without repository");
 		git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
 	}
 	gitfile = read_gitfile(git_dir);
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
@@ -1539,4 +1539,10 @@ test_expect_success !MINGW '--show-origin blob ref' '
 	test_cmp expect output
 '
 
+test_expect_failure '--local requires a repo' '
+	# we expect 128 to ensure that we do not simply
+	# fail to find anything and return code "1"
+	test_expect_code 128 nongit git config --local foo.bar
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ static void setup_git_env(void)`
`169`	`169`	`git_dir = getenv(GIT_DIR_ENVIRONMENT);`
`170`	`170`	`if (!git_dir) {`
`171`	`171`	`if (!startup_info->have_repository)`
`172`		`- die("BUG: setup_git_env called without repository");`
	`172`	`+ BUG("setup_git_env called without repository");`
`173`	`173`	`git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;`
`174`	`174`	`}`
`175`	`175`	`gitfile = read_gitfile(git_dir);`