diff options
author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-06-17 20:21:08 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-06-17 15:45:48 -0700 |
commit | e5c1272c07eb5b70e2f785ff715a800f0e3f456e (patch) | |
tree | 2aad4cf9670bb3024d38ea1838ca01b35c345b8b /t/t7607-merge-overwrite.sh | |
parent | 1edbaac3bbe1a55cf3450ae7a350b50826d5d283 (diff) | |
download | git-e5c1272c07eb5b70e2f785ff715a800f0e3f456e.tar.gz git-e5c1272c07eb5b70e2f785ff715a800f0e3f456e.tar.xz |
tests: unpack-trees: update to use test_i18n* functions
Use functions test_i18ncmp and test_i18ngrep to successfully pass tests
running under GETTEXT_POISON.
The output strings compared to in these test were marked for translation
in ed47fdf ("i18n: unpack-trees: mark strings for translation",
2016-04-09) and later improved in 2e3926b ("i18n: unpack-trees: avoid
substituting only a verb in sentences", 2016-05-12).
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7607-merge-overwrite.sh')
-rwxr-xr-x | t/t7607-merge-overwrite.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index 758a623cd..e8ec54c13 100755 --- a/t/t7607-merge-overwrite.sh +++ b/t/t7607-merge-overwrite.sh @@ -125,7 +125,7 @@ test_expect_success 'will not overwrite untracked file in leading path' ' cp important sub && cp important sub2 && test_must_fail git merge sub 2>out && - test_cmp out expect && + test_i18ncmp out expect && test_path_is_missing .git/MERGE_HEAD && test_cmp important sub && test_cmp important sub2 && |