diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:26:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:26:59 -0700 |
| commit | 7a190a215dbcf782c33ed531104389de8504e29d (patch) | |
| tree | 05b00d7adb3abb89de530834599a5daa04a6d026 /t/t1300-repo-config.sh | |
| parent | 146b0ab1a528b54803adbf8b6b72239a8d68a65c (diff) | |
| parent | 3d7dd2d3b6ccc8903a37cffe3a2f39cf1be21c86 (diff) | |
| download | git-7a190a215dbcf782c33ed531104389de8504e29d.tar.gz git-7a190a215dbcf782c33ed531104389de8504e29d.tar.xz | |
Merge branch 'jk/bug-to-abort' into maint
Introduce the BUG() macro to improve die("BUG: ...").
* jk/bug-to-abort:
usage: add NORETURN to BUG() function definitions
config: complain about --local outside of a git repo
setup_git_env: convert die("BUG") to BUG()
usage.c: add BUG() function
Diffstat (limited to 't/t1300-repo-config.sh')
| -rwxr-xr-x | t/t1300-repo-config.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index afcca0d52..13b7851f7 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_success '--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 |