Skip to content

Commit f1beaae

Browse files
dschogitster
authored andcommitted
t1309: use a neutral branch name in the onbranch test cases
The `onbranch` test cases touched by this patch do not actually try to include any other config. Their purpose is to avoid regressing on two bugs in the `include.onbranch:<name>.path` code that we fixed in the past, bugs that are actually unrelated to any concrete branch name. The first bug was fixed in 85fe0e8 (config: work around bug with includeif:onbranch and early config, 2019-07-31). Essentially, when reading early config, there would be a catch-22 trying to access the refs, and therefore we simply cannot evaluate the condition at that point. The test case ensures that we avoid emitting this bogus message: BUG: refs.c:1851: attempting to get main_ref_store outside of repository The second test case concerns the non-Git scenario, where we simply do not have a current branch to begin with (because we don't have a repository in the first place), and the test case was introduced in 22932d9 (config: stop checking whether the_repository is NULL, 2019-08-06) to ensure that we don't cause a segmentation fault should the code still incorrectly try to look at any ref. In short, neither of these two test cases will ever look at a current branch name, even in case of regressions. Therefore, the actual branch name does not matter at all. We can therefore easily avoid racially-charged branch names here, and that's what this patch does. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent faefdd6 commit f1beaae

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t1309-early-config.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ test_expect_failure 'ignore .git/ with invalid config' '
9191

9292
test_expect_success 'early config and onbranch' '
9393
echo "[broken" >broken &&
94-
test_with_config "[includeif \"onbranch:master\"]path=../broken"
94+
test_with_config "[includeif \"onbranch:topic\"]path=../broken"
9595
'
9696

9797
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 &&
9999
nongit git help
100100
'
101101

0 commit comments

Comments
 (0)