mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
568cabb2fe
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>
147 lines
2.6 KiB
Bash
Executable file
147 lines
2.6 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='checkout --pathspec-from-file'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_tick
|
|
|
|
test_expect_success setup '
|
|
test_commit file0 &&
|
|
|
|
echo 1 >fileA.t &&
|
|
echo 1 >fileB.t &&
|
|
echo 1 >fileC.t &&
|
|
echo 1 >fileD.t &&
|
|
git add fileA.t fileB.t fileC.t fileD.t &&
|
|
git commit -m "files 1" &&
|
|
|
|
echo 2 >fileA.t &&
|
|
echo 2 >fileB.t &&
|
|
echo 2 >fileC.t &&
|
|
echo 2 >fileD.t &&
|
|
git add fileA.t fileB.t fileC.t fileD.t &&
|
|
git commit -m "files 2" &&
|
|
|
|
git tag checkpoint
|
|
'
|
|
|
|
restore_checkpoint () {
|
|
git reset --hard checkpoint
|
|
}
|
|
|
|
verify_expect () {
|
|
git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual &&
|
|
test_cmp expect actual
|
|
}
|
|
|
|
test_expect_success '--pathspec-from-file from stdin' '
|
|
restore_checkpoint &&
|
|
|
|
echo fileA.t | git checkout --pathspec-from-file=- HEAD^1 &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M fileA.t
|
|
EOF
|
|
verify_expect
|
|
'
|
|
|
|
test_expect_success '--pathspec-from-file from file' '
|
|
restore_checkpoint &&
|
|
|
|
echo fileA.t >list &&
|
|
git checkout --pathspec-from-file=list HEAD^1 &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M fileA.t
|
|
EOF
|
|
verify_expect
|
|
'
|
|
|
|
test_expect_success 'NUL delimiters' '
|
|
restore_checkpoint &&
|
|
|
|
printf "fileA.t\0fileB.t\0" | git checkout --pathspec-from-file=- --pathspec-file-nul HEAD^1 &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M fileA.t
|
|
M fileB.t
|
|
EOF
|
|
verify_expect
|
|
'
|
|
|
|
test_expect_success 'LF delimiters' '
|
|
restore_checkpoint &&
|
|
|
|
printf "fileA.t\nfileB.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M fileA.t
|
|
M fileB.t
|
|
EOF
|
|
verify_expect
|
|
'
|
|
|
|
test_expect_success 'no trailing delimiter' '
|
|
restore_checkpoint &&
|
|
|
|
printf "fileA.t\nfileB.t" | git checkout --pathspec-from-file=- HEAD^1 &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M fileA.t
|
|
M fileB.t
|
|
EOF
|
|
verify_expect
|
|
'
|
|
|
|
test_expect_success 'CRLF delimiters' '
|
|
restore_checkpoint &&
|
|
|
|
printf "fileA.t\r\nfileB.t\r\n" | git checkout --pathspec-from-file=- HEAD^1 &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M fileA.t
|
|
M fileB.t
|
|
EOF
|
|
verify_expect
|
|
'
|
|
|
|
test_expect_success 'quotes' '
|
|
restore_checkpoint &&
|
|
|
|
cat >list <<-\EOF &&
|
|
"file\101.t"
|
|
EOF
|
|
|
|
git checkout --pathspec-from-file=list HEAD^1 &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M fileA.t
|
|
EOF
|
|
verify_expect
|
|
'
|
|
|
|
test_expect_success 'quotes not compatible with --pathspec-file-nul' '
|
|
restore_checkpoint &&
|
|
|
|
cat >list <<-\EOF &&
|
|
"file\101.t"
|
|
EOF
|
|
|
|
test_must_fail git checkout --pathspec-from-file=list --pathspec-file-nul HEAD^1
|
|
'
|
|
|
|
test_expect_success 'only touches what was listed' '
|
|
restore_checkpoint &&
|
|
|
|
printf "fileB.t\nfileC.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M fileB.t
|
|
M fileC.t
|
|
EOF
|
|
verify_expect
|
|
'
|
|
|
|
test_done
|