diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:35 -0700 |
| commit | b4a1eec33249344b5c7b978d397259088cafd219 (patch) | |
| tree | 128d1be124f4b323371a4efffb4767cf10a84b36 /t | |
| parent | Merge branch 'py/git-gui-do-quit' (diff) | |
| parent | config: stop checking whether the_repository is NULL (diff) | |
| download | tgif-b4a1eec33249344b5c7b978d397259088cafd219.tar.xz | |
Merge branch 'jk/repo-init-cleanup'
Further clean-up of the initialization code.
* jk/repo-init-cleanup:
config: stop checking whether the_repository is NULL
common-main: delay trace2 initialization
t1309: use short branch name in includeIf.onbranch test
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1309-early-config.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh index 0c37e7180d..3a0de0ddaa 100755 --- a/t/t1309-early-config.sh +++ b/t/t1309-early-config.sh @@ -91,7 +91,12 @@ test_expect_failure 'ignore .git/ with invalid config' ' test_expect_success 'early config and onbranch' ' echo "[broken" >broken && - test_with_config "[includeif \"onbranch:refs/heads/master\"]path=../broken" + test_with_config "[includeif \"onbranch:master\"]path=../broken" +' + +test_expect_success 'onbranch config outside of git repo' ' + test_config_global includeIf.onbranch:master.path non-existent && + nongit git help ' test_done |