Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2019-07-31 00:29:15 +0300
committerJunio C Hamano <gitster@pobox.com>2019-07-31 20:07:48 +0300
commit814291cf3f286ddffc291e4820c62ac729e83171 (patch)
treee7c757e60e94d096758039a044938450e7fef03d
parent026dd738a6e5f1e42ef0f390feacb5ed6acc4ee8 (diff)
t5510-fetch: fix negated 'test_i18ngrep' invocation
The test '--no-show-forced-updates' in 't5510-fetch.sh' added in cdbd70c437 (fetch: add --[no-]show-forced-updates argument, 2019-06-18) runs '! test_i18ngrep ...'. This is wrong, because when running the test with GIT_TEST_GETTEXT_POISON=true, then 'test_i18ngrep' is basically a noop and always returns with success, the leading ! turns that into a failure, which then fails the test. Use 'test_i18ngrep ! ...' instead. This went unnoticed by our GETTEXT_POISON CI builds, because those builds don't run this test case: in those builds we don't install Apache, and this test comes after 't5510' sources 'lib-httpd.sh', which, consequently, skips all the remaining tests, including this one. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5510-fetch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 139f7106f78..f2481de577b 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -997,7 +997,7 @@ test_expect_success '--no-show-forced-updates' '
(
cd no-forced-update-clone &&
git fetch --no-show-forced-updates origin 2>output &&
- ! test_i18ngrep "(forced update)" output
+ test_i18ngrep ! "(forced update)" output
)
'