diff options
| author | Jeff King <peff@peff.net> | 2017-05-12 23:29:18 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-15 11:30:00 +0900 |
| commit | 588a538ae554f61a37d43c972da75d0f7c3ed484 (patch) | |
| tree | 97c3c46b9d2b8468faa7d134c9757b8c520087c8 | |
| parent | d8193743e0883e7331c102a4d04cee5324eb3b5f (diff) | |
| download | git-588a538ae554f61a37d43c972da75d0f7c3ed484.tar.gz | |
setup_git_env: convert die("BUG") to BUG()
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | environment.c | 2 | ||||
| -rwxr-xr-x | t/t1300-repo-config.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/environment.c b/environment.c index ff6e4f06e9..1f0bda5afa 100644 --- 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 index afcca0d52c..867704a642 100755 --- 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 |