Merge branch 'js/t1309-master-to-topic'

gitster · gitster · commit 124250108f24 · 2020-11-30T14:49:42.000-08:00
Test preparation.

* js/t1309-master-to-topic:
  t1309: use a neutral branch name in the `onbranch` test cases
diff --git 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,11 @@ test_expect_failure 'ignore .git/ with invalid config' '`
`91`	`91`
`92`	`92`	`test_expect_success 'early config and onbranch' '`
`93`	`93`	`echo "[broken" >broken &&`
`94`		`- test_with_config "[includeif \"onbranch:master\"]path=../broken"`
	`94`	`+ test_with_config "[includeif \"onbranch:topic\"]path=../broken"`
`95`	`95`	`'`
`96`	`96`
`97`	`97`	`test_expect_success 'onbranch config outside of git repo' '`
`98`		`- test_config_global includeIf.onbranch:master.path non-existent &&`
	`98`	`+ test_config_global includeIf.onbranch:topic.path non-existent &&`
`99`	`99`	`nongit git help`
`100`	`100`	`'`
`101`	`101`