diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:41:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-10 07:52:54 (GMT) |
| commit | 9c227655b02c8f84e319a57bb8dd7cff63e3fbf8 (patch) | |
| tree | 24bdb4fa3d3780061bcda184af799a188942a41a /t/t7110-reset-merge.sh | |
| parent | 8a6179bcb6022c433ac87a01393155d64166eb7b (diff) | |
| download | git-9c227655b02c8f84e319a57bb8dd7cff63e3fbf8.zip git-9c227655b02c8f84e319a57bb8dd7cff63e3fbf8.tar.gz git-9c227655b02c8f84e319a57bb8dd7cff63e3fbf8.tar.bz2 | |
i18n: git-commit "middle of a merge" message
Gettextize the "You are in the middle of a merge -- cannot amend."
message. Several tests in t7110-reset-merge.sh explicitly checked for
this message. Change them to skip under GETTEXT_POISON=YesPlease.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7110-reset-merge.sh')
| -rwxr-xr-x | t/t7110-reset-merge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh index 70cdd8e..b42820a 100755 --- a/t/t7110-reset-merge.sh +++ b/t/t7110-reset-merge.sh @@ -233,7 +233,7 @@ test_expect_success '"reset --merge HEAD^" is ok with pending merge' ' # working index HEAD target working index HEAD # ---------------------------------------------------- # file1: X U B C --keep (disallowed) -test_expect_success '"reset --keep HEAD^" fails with pending merge' ' +test_expect_success C_LOCALE_OUTPUT '"reset --keep HEAD^" fails with pending merge' ' git reset --hard third && test_must_fail git merge branch1 && test_must_fail git reset --keep HEAD^ 2>err.log && @@ -259,7 +259,7 @@ test_expect_success '"reset --merge HEAD" is ok with pending merge' ' # working index HEAD target working index HEAD # ---------------------------------------------------- # file1: X U B B --keep (disallowed) -test_expect_success '"reset --keep HEAD" fails with pending merge' ' +test_expect_success C_LOCALE_OUTPUT '"reset --keep HEAD" fails with pending merge' ' git reset --hard third && test_must_fail git merge branch1 && test_must_fail git reset --keep HEAD 2>err.log && @@ -280,7 +280,7 @@ test_expect_success '--merge is ok with added/deleted merge' ' git diff --exit-code --cached ' -test_expect_success '--keep fails with added/deleted merge' ' +test_expect_success C_LOCALE_OUTPUT '--keep fails with added/deleted merge' ' git reset --hard third && rm -f file2 && test_must_fail git merge branch3 && |