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
maint
Junio C Hamano 2020-11-30 14:49:42 -08:00
commit 124250108f
1 changed files with 2 additions and 2 deletions

View File

@ -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
'