diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-28 19:38:27 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-08-29 10:35:05 -0700 |
| commit | f6af6f9970cfd385b1e7aae12d86a6fcff814e33 (patch) | |
| tree | 263233e1e91c44e83a6a182d66316414f6715daa /merge.c | |
| parent | tests: fix non-portable "${var:-"str"}" construct (diff) | |
| download | tgif-f6af6f9970cfd385b1e7aae12d86a6fcff814e33.tar.xz | |
tests: fix non-portable iconv invocation
The iconv that comes with a FreeBSD 11.2-RELEASE-p2 box I have access
to doesn't support the SHIFT-JIS encoding. Guard a test added in
e92d62253 ("convert: add round trip check based on
'core.checkRoundtripEncoding'", 2018-04-15) first released with Git
v2.18.0 with a prerequisite that checks for its availability.
The iconv command is in POSIX, and we have numerous tests
unconditionally relying on its ability to convert ASCII, UTF-8 and
UTF-16, but unconditionally relying on the presence of more obscure
encodings isn't portable.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions