diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-16 00:08:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-16 00:08:23 +0200 |
| commit | 4bea8485e395769951c6b9eddfba1081ea7ef47f (patch) | |
| tree | c5165f024d8211bc3295a141226e0b49cf84f1bb /t/t3210-pack-refs.sh | |
| parent | Merge branch 'hs/gpgsm' (diff) | |
| parent | transport-helper.c: mark more strings for translation (diff) | |
| download | git-4bea8485e395769951c6b9eddfba1081ea7ef47f.tar.xz git-4bea8485e395769951c6b9eddfba1081ea7ef47f.zip | |
Merge branch 'nd/i18n'
Many more strings are prepared for l10n.
* nd/i18n: (23 commits)
transport-helper.c: mark more strings for translation
transport.c: mark more strings for translation
sha1-file.c: mark more strings for translation
sequencer.c: mark more strings for translation
replace-object.c: mark more strings for translation
refspec.c: mark more strings for translation
refs.c: mark more strings for translation
pkt-line.c: mark more strings for translation
object.c: mark more strings for translation
exec-cmd.c: mark more strings for translation
environment.c: mark more strings for translation
dir.c: mark more strings for translation
convert.c: mark more strings for translation
connect.c: mark more strings for translation
config.c: mark more strings for translation
commit-graph.c: mark more strings for translation
builtin/replace.c: mark more strings for translation
builtin/pack-objects.c: mark more strings for translation
builtin/grep.c: mark strings for translation
builtin/config.c: mark more strings for translation
...
Diffstat (limited to 't/t3210-pack-refs.sh')
| -rwxr-xr-x | t/t3210-pack-refs.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh index 724b4b9bc0..7333d7d545 100755 --- a/t/t3210-pack-refs.sh +++ b/t/t3210-pack-refs.sh @@ -186,7 +186,7 @@ test_expect_success 'notice d/f conflict with existing directory' ' test_expect_success 'existing directory reports concrete ref' ' test_must_fail git branch foo 2>stderr && - grep refs/heads/foo/bar/baz stderr + test_i18ngrep refs/heads/foo/bar/baz stderr ' test_expect_success 'notice d/f conflict with existing ref' ' |