diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-25 19:23:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 19:23:34 (GMT) |
| commit | 35869f4c626619c2574068752aef6d3130c0ae02 (patch) | |
| tree | 73deee0874d2349ad2fc0ff93f23bf13d464bb8a /t | |
| parent | b47761dd1e9aeafdc847b2f235aba81f8a3bdf7d (diff) | |
| parent | 97c1364be6b27a6faf046d6d4240a4ebd550ae9f (diff) | |
| download | git-35869f4c626619c2574068752aef6d3130c0ae02.zip git-35869f4c626619c2574068752aef6d3130c0ae02.tar.gz git-35869f4c626619c2574068752aef6d3130c0ae02.tar.bz2 | |
Merge branch 'pb/trim-trailing-spaces'
* pb/trim-trailing-spaces:
t0008: do not depend on 'echo' handling backslashes specially
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0008-ignores.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index 5ef5ad3..39e55a1 100755 --- 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 && |