Merge branch 'tb/unicode-7.0-display-width'

diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index 5ef5ad3db4f6c307e6bcf71f57dcdc4deaafc082..39e55a13c885399150094f9a2774f85e0acd63a6 100755 (executable)
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -816,12 +816,14 @@ test_expect_success NOT_MINGW,NOT_CYGWIN 'correct handling of backslashes' '
        >"whitespace/trailing 5 \\ \\ " &&
        >"whitespace/trailing 6 \\a\\" &&
        >whitespace/untracked &&
-       echo "whitespace/trailing 1 \\    " >ignore  &&
-       echo "whitespace/trailing 2 \\\\\\\\\\\\\\\\" >>ignore &&
-       echo "whitespace/trailing 3 \\\\\\\\\\\\\\\\ " >>ignore &&
-       echo "whitespace/trailing 4   \\\\\\\\\\\\    " >>ignore &&
-       echo "whitespace/trailing 5 \\\\\\\\ \\\\\\\\\\\\   " >>ignore &&
-       echo "whitespace/trailing 6 \\\\\\\\a\\\\\\\\" >>ignore &&
+       sed -e "s/Z$//" >ignore <<-\EOF &&
+       whitespace/trailing 1 \    Z
+       whitespace/trailing 2 \\\\Z
+       whitespace/trailing 3 \\\\ Z
+       whitespace/trailing 4   \\\    Z
+       whitespace/trailing 5 \\ \\\   Z
+       whitespace/trailing 6 \\a\\Z
+       EOF
        echo whitespace/untracked >expect &&
        >err.expect &&
        git ls-files -o -X ignore whitespace >actual 2>err &&