summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-branches-one-merge_branches-one
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder.dev@gmail.com>2019-08-01 17:53:07 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-01 11:39:00 -0700
commit12b1826609d5c309336ffd9f56e42abaf8d96cef (patch)
treef575c654a02d3279d36612c9e4ff298585b46463 /t/t5515/fetch.br-branches-one-merge_branches-one
parentt5510-fetch: fix negated 'test_i18ngrep' invocation (diff)
downloadtgif-12b1826609d5c309336ffd9f56e42abaf8d96cef.tar.xz
t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
't5510-fetch.sh' sources 'lib-httpd.sh' near the end to run a httpd-specific test, but 'lib-httpd.sh' skips all the rest of the test script if the dependencies for running httpd tests are not fulfilled. Alas, recently cdbd70c437 (fetch: add --[no-]show-forced-updates argument, 2019-06-18) appended a non-httpd-specific test at the end, and this test is then skipped as well when httpd tests can't be run. Move this new test earlier in the test script, before 'lib-httpd.sh' is sourced, so it will be run even when httpd tests aren't. Also add a comment at the end of this test script to warn against adding non-httpd-specific tests at the end, in the hope that it will help prevent similar issues in the future. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/fetch.br-branches-one-merge_branches-one')
0 files changed, 0 insertions, 0 deletions