Skip to content

Commit

Permalink
Merge branch 'js/t1309-master-to-topic'
Browse files Browse the repository at this point in the history
Test preparation.

* js/t1309-master-to-topic:
  t1309: use a neutral branch name in the `onbranch` test cases
  • Loading branch information
gitster committed Nov 30, 2020
2 parents 290c940 + f1beaae commit 1242501
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions t/t1309-early-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'

Expand Down

0 comments on commit 1242501

Please sign in to comment.