diff options
| -rwxr-xr-x | t/t3300-funny-names.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh index 897c378422..6a85d67c57 100755 --- a/t/t3300-funny-names.sh +++ b/t/t3300-funny-names.sh @@ -15,7 +15,7 @@ test "$(uname -o 2>/dev/null)" = Cygwin && exit 0 . ./test-lib.sh p0='no-funny' -p1='tabs and spaces' +p1='tabs ," (dq) and spaces' p2='just space' cat >"$p0" <<\EOF @@ -39,7 +39,7 @@ echo "$t0" >t0 echo 'just space no-funny -"tabs\tand spaces"' >expected +"tabs\t,\" (dq) and spaces"' >expected test_expect_success 'git-ls-files with-funny' \ 'git-update-index --add "$p1" && git-ls-files >current && @@ -47,7 +47,7 @@ test_expect_success 'git-ls-files with-funny' \ echo 'just space no-funny -tabs and spaces' >expected +tabs ," (dq) and spaces' >expected test_expect_success 'git-ls-files -z with-funny' \ 'git-ls-files -z | tr \\0 \\012 >current && diff -u expected current' @@ -57,12 +57,12 @@ echo "$t1" >t1 echo 'just space no-funny -"tabs\tand spaces"' >expected +"tabs\t,\" (dq) and spaces"' >expected test_expect_success 'git-ls-tree with funny' \ 'git-ls-tree -r $t1 | sed -e "s/^[^ ]* //" >current && diff -u expected current' -echo 'A "tabs\tand spaces"' >expected +echo 'A "tabs\t,\" (dq) and spaces"' >expected test_expect_success 'git-diff-index with-funny' \ 'git-diff-index --name-status $t0 >current && diff -u expected current' @@ -72,7 +72,7 @@ test_expect_success 'git-diff-tree with-funny' \ diff -u expected current' echo 'A -tabs and spaces' >expected +tabs ," (dq) and spaces' >expected test_expect_success 'git-diff-index -z with-funny' \ 'git-diff-index -z --name-status $t0 | tr \\0 \\012 >current && diff -u expected current' @@ -81,23 +81,23 @@ test_expect_success 'git-diff-tree -z with-funny' \ 'git-diff-tree -z --name-status $t0 $t1 | tr \\0 \\012 >current && diff -u expected current' -echo 'CNUM no-funny "tabs\tand spaces"' >expected +echo 'CNUM no-funny "tabs\t,\" (dq) and spaces"' >expected test_expect_success 'git-diff-tree -C with-funny' \ 'git-diff-tree -C --find-copies-harder --name-status \ $t0 $t1 | sed -e 's/^C[0-9]*/CNUM/' >current && diff -u expected current' -echo 'RNUM no-funny "tabs\tand spaces"' >expected +echo 'RNUM no-funny "tabs\t,\" (dq) and spaces"' >expected test_expect_success 'git-diff-tree delete with-funny' \ 'git-update-index --force-remove "$p0" && git-diff-index -M --name-status \ $t0 | sed -e 's/^R[0-9]*/RNUM/' >current && diff -u expected current' -echo 'diff --git a/no-funny "b/tabs\tand spaces" +echo 'diff --git a/no-funny "b/tabs\t,\" (dq) and spaces" similarity index NUM% rename from no-funny -rename to "tabs\tand spaces"' >expected +rename to "tabs\t,\" (dq) and spaces"' >expected test_expect_success 'git-diff-tree delete with-funny' \ 'git-diff-index -M -p $t0 | @@ -105,19 +105,19 @@ test_expect_success 'git-diff-tree delete with-funny' \ diff -u expected current' chmod +x "$p1" -echo 'diff --git a/no-funny "b/tabs\tand spaces" +echo 'diff --git a/no-funny "b/tabs\t,\" (dq) and spaces" old mode 100644 new mode 100755 similarity index NUM% rename from no-funny -rename to "tabs\tand spaces"' >expected +rename to "tabs\t,\" (dq) and spaces"' >expected test_expect_success 'git-diff-tree delete with-funny' \ 'git-diff-index -M -p $t0 | sed -e "s/index [0-9]*%/index NUM%/" >current && diff -u expected current' -echo >expected ' "tabs\tand spaces" +echo >expected ' "tabs\t,\" (dq) and spaces" 1 files changed, 0 insertions(+), 0 deletions(-)' test_expect_success 'git-diff-tree rename with-funny applied' \ 'git-diff-index -M -p $t0 | @@ -125,7 +125,7 @@ test_expect_success 'git-diff-tree rename with-funny applied' \ diff -u expected current' echo >expected ' no-funny - "tabs\tand spaces" + "tabs\t,\" (dq) and spaces" 2 files changed, 3 insertions(+), 3 deletions(-)' test_expect_success 'git-diff-tree delete with-funny applied' \ |