mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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 in85fe0e800c
(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 in22932d9169
(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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
faefdd61ec
commit
f1beaaefaa
|
@ -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
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue