| #!/bin/sh |
| |
| test_description='restore --pathspec-from-file' |
| |
| . ./test-lib.sh |
| |
| test_tick |
| |
| test_expect_success setup ' |
| test_commit file0 && |
| |
| mkdir dir1 && |
| echo 1 >dir1/file && |
| echo 1 >fileA.t && |
| echo 1 >fileB.t && |
| echo 1 >fileC.t && |
| echo 1 >fileD.t && |
| git add dir1 fileA.t fileB.t fileC.t fileD.t && |
| git commit -m "files 1" && |
| |
| echo 2 >dir1/file && |
| echo 2 >fileA.t && |
| echo 2 >fileB.t && |
| echo 2 >fileC.t && |
| echo 2 >fileD.t && |
| git add dir1 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 -- dir1 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 restore --pathspec-from-file=- --source=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 restore --pathspec-from-file=list --source=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 restore --pathspec-from-file=- --pathspec-file-nul --source=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 restore --pathspec-from-file=- --source=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 restore --pathspec-from-file=- --source=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 restore --pathspec-from-file=- --source=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 restore --pathspec-from-file=list --source=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 restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1 |
| ' |
| |
| test_expect_success 'only touches what was listed' ' |
| restore_checkpoint && |
| |
| printf "fileB.t\nfileC.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 && |
| |
| cat >expect <<-\EOF && |
| M fileB.t |
| M fileC.t |
| EOF |
| verify_expect |
| ' |
| |
| test_expect_success 'error conditions' ' |
| restore_checkpoint && |
| echo fileA.t >list && |
| >empty_list && |
| |
| test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err && |
| test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err && |
| |
| test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err && |
| test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && |
| |
| test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err && |
| test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err && |
| |
| test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err && |
| test_grep -e "you must specify path(s) to restore" err |
| ' |
| |
| test_expect_success 'wildcard pathspec matches file in subdirectory' ' |
| restore_checkpoint && |
| |
| echo "*file" | git restore --pathspec-from-file=- --source=HEAD^1 && |
| cat >expect <<-\EOF && |
| M dir1/file |
| EOF |
| verify_expect |
| ' |
| |
| test_done |