diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-30 14:49:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-30 14:49:42 -0800 |
| commit | 124250108f2495b3fbb821714e8899be93db90b3 (patch) | |
| tree | 4a36b04499e02fe4ce709dd59352f826419a773e | |
| parent | Merge branch 'js/pull-rebase-use-advise' (diff) | |
| parent | t1309: use a neutral branch name in the `onbranch` test cases (diff) | |
| download | tgif-124250108f2495b3fbb821714e8899be93db90b3.tar.xz | |
Merge branch 'js/t1309-master-to-topic'
Test preparation.
* js/t1309-master-to-topic:
t1309: use a neutral branch name in the `onbranch` test cases
| -rwxr-xr-x | t/t1309-early-config.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh index ebb8e1aecb..b4a9158307 100755 --- a/t/t1309-early-config.sh +++ b/t/t1309-early-config.sh @@ -91,11 +91,11 @@ test_expect_failure 'ignore .git/ with invalid config' ' test_expect_success 'early config and onbranch' ' echo "[broken" >broken && - test_with_config "[includeif \"onbranch:master\"]path=../broken" + test_with_config "[includeif \"onbranch:topic\"]path=../broken" ' test_expect_success 'onbranch config outside of git repo' ' - test_config_global includeIf.onbranch:master.path non-existent && + test_config_global includeIf.onbranch:topic.path non-existent && nongit git help ' |