From: Stefan Beller Date: Fri, 05 May 2017 17:38:41 GMT Subject: [PATCH] t7406: fix i18n expectation of error message Message-ID: <20170505173841.20555-1-sbeller@google.com> In-Reply-To: <20170505154053.58128-1-larsxschneider@gmail.com> The error message from "submodule update" is internationalized, which makes sense. The test however did not check for the translated version, but used a hardcoded string, which breaks the test when run with GETTEXT_POISON. Signed-off-by: Stefan Beller --- t/t7406-submodule-update.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 4ac386d98b..12f6435ab0 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -441,13 +441,11 @@ test_expect_success 'submodule update - command in .git/config catches failure - test_i18ncmp actual expect ' +sq="'" test_expect_success 'submodule update - command run for initial population of submodule' ' - cat >expect <<-EOF && - Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\'' - EOF rm -rf super/submodule && test_must_fail git -C super submodule update 2>actual && - test_cmp expect actual && + test_i18ngrep "Execution of ${sq}false $submodulesha1${sq} failed in submodule path ${sq}submodule${sq}" actual && git -C super submodule update --checkout ' -- 2.13.0.rc2.dirty