зеркало из https://github.com/microsoft/git.git
t: fix quotes tests for --pathspec-from-file
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:
Родитель
d0654dc308
Коммит
568cabb2fe
|
@ -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
|
||||
'
|
||||
|
||||
|
|
|
@ -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
|
||||
'
|
||||
|
||||
|
|
|
@ -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
|
||||
'
|
||||
|
||||
|
|
|
@ -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 &&
|
||||
|
||||
|
|
|
@ -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"
|
||||
'
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче