diff options
author | Armin Kunaschik <megabreit@googlemail.com> | 2016-05-09 11:57:25 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-09 13:45:22 -0700 |
commit | 2bb051861731a0d8d2a79d0b36857d877f18e476 (patch) | |
tree | 2327415fca0577cb4bb2818c6f226327e25bcbe3 /mergetools/xxdiff | |
parent | Git 2.4.11 (diff) | |
download | tgif-2bb051861731a0d8d2a79d0b36857d877f18e476.tar.xz |
t4151: make sure argument to 'test -z' is given
88d50724 (am --skip: revert changes introduced by failed 3way merge,
2015-06-06), unlike all the other patches in the series, forgot to
quote the output from "$(git ls-files -u)" when using it as the
argument to "test -z", leading to a syntax error on platforms whose
test does not interpret "test -z" (no other arguments) as testing if
a string "-z" is the null string (which GNU test and test that is
built into bash and dash seem to do).
Note that $(git ls-files -u | wc -l) is deliberately left unquoted,
as some implementations of "wc -l" includes extra blank characters
in its output and cannot be compared as string, i.e. "test 0 = $(...)".
Signed-off-by: Armin Kunaschik <megabreit@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/xxdiff')
0 files changed, 0 insertions, 0 deletions