diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-04 21:33:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 21:33:31 (GMT) |
| commit | 3813a89faee3ecb111aa206f68b46618ec853e4e (patch) | |
| tree | 488acb52008ebfe2fa525cf535e6f2df66977e29 /t/t5703-upload-pack-ref-in-want.sh | |
| parent | b21ebb671bb7dea8d342225f0d66c41f4e54d5ca (diff) | |
| parent | 674ba34038568e36090c6c4c616a3266c8b6459e (diff) | |
| download | git-3813a89faee3ecb111aa206f68b46618ec853e4e.zip git-3813a89faee3ecb111aa206f68b46618ec853e4e.tar.gz git-3813a89faee3ecb111aa206f68b46618ec853e4e.tar.bz2 | |
Merge branch 'nd/i18n'
More _("i18n") markings.
* nd/i18n:
fsck: mark strings for translation
fsck: reduce word legos to help i18n
parse-options.c: mark more strings for translation
parse-options.c: turn some die() to BUG()
parse-options: replace opterror() with optname()
repack: mark more strings for translation
remote.c: mark messages for translation
remote.c: turn some error() or die() to BUG()
reflog: mark strings for translation
read-cache.c: add missing colon separators
read-cache.c: mark more strings for translation
read-cache.c: turn die("internal error") to BUG()
attr.c: mark more string for translation
archive.c: mark more strings for translation
alias.c: mark split_cmdline_strerror() strings for translation
git.c: mark more strings for translation
Diffstat (limited to 't/t5703-upload-pack-ref-in-want.sh')
| -rwxr-xr-x | t/t5703-upload-pack-ref-in-want.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh index 3f58f05..7053899 100755 --- a/t/t5703-upload-pack-ref-in-want.sh +++ b/t/t5703-upload-pack-ref-in-want.sh @@ -208,7 +208,7 @@ test_expect_success 'server is initially ahead - no ref in want' ' cp -r "$LOCAL_PRISTINE" local && inconsistency master 1234567890123456789012345678901234567890 && test_must_fail git -C local fetch 2>err && - grep "ERR upload-pack: not our ref" err + test_i18ngrep "ERR upload-pack: not our ref" err ' test_expect_success 'server is initially ahead - ref in want' ' @@ -254,7 +254,7 @@ test_expect_success 'server loses a ref - ref in want' ' echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" && test_must_fail git -C local fetch 2>err && - grep "ERR unknown ref refs/heads/raster" err + test_i18ngrep "ERR unknown ref refs/heads/raster" err ' stop_httpd |