mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 07:40:44 +02:00
Code

t: fix quotes tests for --pathspec-from-file

Browse Source 
While working on the next patch, I also noticed that quotes testing via
`"\"file\\101.t\""` was somewhat incorrect: I escaped `\` one time while
I had to escape it two times! Tests still worked due to `"` being
preserved which in turn prevented pathspec from matching files.

Fix this by using here-doc instead.

Signed-off-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alexandr Miloslavskiy 2019-12-31 10:15:11 +00:00 committed by Junio C Hamano
parent d0654dc308
commit 568cabb2fe
5 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
t/t2026-checkout-pathspec-file.sh
View File

@ -109,7 +109,11 @@ test_expect_success 'CRLF delimiters' '
test_expect_success 'quotes' '
restore_checkpoint &&
printf "\"file\\101.t\"" | git checkout --pathspec-from-file=- HEAD^1 &&
cat >list <<-\EOF &&
"file\101.t"
EOF
git checkout --pathspec-from-file=list HEAD^1 &&
cat >expect <<-\EOF &&
M fileA.t
@ -120,7 +124,10 @@ test_expect_success 'quotes' '
test_expect_success 'quotes not compatible with --pathspec-file-nul' '
restore_checkpoint &&
printf "\"file\\101.t\"" >list &&
cat >list <<-\EOF &&
"file\101.t"
EOF
test_must_fail git checkout --pathspec-from-file=list --pathspec-file-nul HEAD^1
'

11
t/t2072-restore-pathspec-file.sh
View File

@ -109,7 +109,11 @@ test_expect_success 'CRLF delimiters' '
test_expect_success 'quotes' '
restore_checkpoint &&
printf "\"file\\101.t\"" | git restore --pathspec-from-file=- --source=HEAD^1 &&
cat >list <<-\EOF &&
"file\101.t"
EOF
git restore --pathspec-from-file=list --source=HEAD^1 &&
cat >expect <<-\EOF &&
M fileA.t
@ -120,7 +124,10 @@ test_expect_success 'quotes' '
test_expect_success 'quotes not compatible with --pathspec-file-nul' '
restore_checkpoint &&
printf "\"file\\101.t\"" >list &&
cat >list <<-\EOF &&
"file\101.t"
EOF
test_must_fail git restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1
'

11
t/t3704-add-pathspec-file.sh
View File

@ -97,7 +97,11 @@ test_expect_success 'CRLF delimiters' '
test_expect_success 'quotes' '
restore_checkpoint &&
printf "\"file\\101.t\"" | git add --pathspec-from-file=- &&
cat >list <<-\EOF &&
"file\101.t"
EOF
git add --pathspec-from-file=list &&
cat >expect <<-\EOF &&
A fileA.t
@ -108,7 +112,10 @@ test_expect_success 'quotes' '
test_expect_success 'quotes not compatible with --pathspec-file-nul' '
restore_checkpoint &&
printf "\"file\\101.t\"" >list &&
cat >list <<-\EOF &&
"file\101.t"
EOF
test_must_fail git add --pathspec-from-file=list --pathspec-file-nul
'

12
t/t7107-reset-pathspec-file.sh
View File

@ -105,8 +105,12 @@ test_expect_success 'CRLF delimiters' '
test_expect_success 'quotes' '
restore_checkpoint &&
cat >list <<-\EOF &&
"file\101.t"
EOF
git rm fileA.t &&
printf "\"file\\101.t\"" | git reset --pathspec-from-file=- &&
git reset --pathspec-from-file=list &&
cat >expect <<-\EOF &&
D fileA.t
@ -117,8 +121,10 @@ test_expect_success 'quotes' '
test_expect_success 'quotes not compatible with --pathspec-file-nul' '
restore_checkpoint &&
git rm fileA.t &&
printf "\"file\\101.t\"" >list &&
cat >list <<-\EOF &&
"file\101.t"
EOF
# Note: "git reset" has not yet learned to fail on wrong pathspecs
git reset --pathspec-from-file=list --pathspec-file-nul &&

11
t/t7526-commit-pathspec-file.sh
View File

@ -100,7 +100,11 @@ test_expect_success 'CRLF delimiters' '
test_expect_success 'quotes' '
restore_checkpoint &&
printf "\"file\\101.t\"" | git commit --pathspec-from-file=- -m "Commit" &&
cat >list <<-\EOF &&
"file\101.t"
EOF
git commit --pathspec-from-file=list -m "Commit" &&
cat >expect <<-\EOF &&
A fileA.t
@ -111,7 +115,10 @@ test_expect_success 'quotes' '
test_expect_success 'quotes not compatible with --pathspec-file-nul' '
restore_checkpoint &&
printf "\"file\\101.t\"" >list &&
cat >list <<-\EOF &&
"file\101.t"
EOF
test_must_fail git commit --pathspec-from-file=list --pathspec-file-nul -m "Commit"
'