Merge branch 'jc/relnotes-v0-extension-update' into master
[git/raj.git] / t / t7107-reset-pathspec-file.sh
blobcad3a9de9efc21339d82b4532d5af482e3446bc9
1 #!/bin/sh
3 test_description='reset --pathspec-from-file'
5 . ./test-lib.sh
7 test_tick
9 test_expect_success setup '
10 echo A >fileA.t &&
11 echo B >fileB.t &&
12 echo C >fileC.t &&
13 echo D >fileD.t &&
14 git add . &&
15 git commit --include . -m "Commit" &&
16 git tag checkpoint
19 restore_checkpoint () {
20 git reset --hard checkpoint
23 verify_expect () {
24 git status --porcelain -- fileA.t fileB.t fileC.t fileD.t >actual &&
25 test_cmp expect actual
28 test_expect_success '--pathspec-from-file from stdin' '
29 restore_checkpoint &&
31 git rm fileA.t &&
32 echo fileA.t | git reset --pathspec-from-file=- &&
34 cat >expect <<-\EOF &&
35 D fileA.t
36 EOF
37 verify_expect
40 test_expect_success '--pathspec-from-file from file' '
41 restore_checkpoint &&
43 git rm fileA.t &&
44 echo fileA.t >list &&
45 git reset --pathspec-from-file=list &&
47 cat >expect <<-\EOF &&
48 D fileA.t
49 EOF
50 verify_expect
53 test_expect_success 'NUL delimiters' '
54 restore_checkpoint &&
56 git rm fileA.t fileB.t &&
57 printf "fileA.t\0fileB.t\0" | git reset --pathspec-from-file=- --pathspec-file-nul &&
59 cat >expect <<-\EOF &&
60 D fileA.t
61 D fileB.t
62 EOF
63 verify_expect
66 test_expect_success 'LF delimiters' '
67 restore_checkpoint &&
69 git rm fileA.t fileB.t &&
70 printf "fileA.t\nfileB.t\n" | git reset --pathspec-from-file=- &&
72 cat >expect <<-\EOF &&
73 D fileA.t
74 D fileB.t
75 EOF
76 verify_expect
79 test_expect_success 'no trailing delimiter' '
80 restore_checkpoint &&
82 git rm fileA.t fileB.t &&
83 printf "fileA.t\nfileB.t" | git reset --pathspec-from-file=- &&
85 cat >expect <<-\EOF &&
86 D fileA.t
87 D fileB.t
88 EOF
89 verify_expect
92 test_expect_success 'CRLF delimiters' '
93 restore_checkpoint &&
95 git rm fileA.t fileB.t &&
96 printf "fileA.t\r\nfileB.t\r\n" | git reset --pathspec-from-file=- &&
98 cat >expect <<-\EOF &&
99 D fileA.t
100 D fileB.t
102 verify_expect
105 test_expect_success 'quotes' '
106 restore_checkpoint &&
108 cat >list <<-\EOF &&
109 "file\101.t"
112 git rm fileA.t &&
113 git reset --pathspec-from-file=list &&
115 cat >expect <<-\EOF &&
116 D fileA.t
118 verify_expect
121 test_expect_success 'quotes not compatible with --pathspec-file-nul' '
122 restore_checkpoint &&
124 cat >list <<-\EOF &&
125 "file\101.t"
128 # Note: "git reset" has not yet learned to fail on wrong pathspecs
129 git reset --pathspec-from-file=list --pathspec-file-nul &&
131 cat >expect <<-\EOF &&
132 D fileA.t
134 test_must_fail verify_expect
137 test_expect_success 'only touches what was listed' '
138 restore_checkpoint &&
140 git rm fileA.t fileB.t fileC.t fileD.t &&
141 printf "fileB.t\nfileC.t\n" | git reset --pathspec-from-file=- &&
143 cat >expect <<-\EOF &&
144 D fileA.t
145 D fileB.t
146 D fileC.t
147 D fileD.t
149 verify_expect
152 test_expect_success 'error conditions' '
153 restore_checkpoint &&
154 echo fileA.t >list &&
155 git rm fileA.t &&
157 test_must_fail git reset --pathspec-from-file=list --patch 2>err &&
158 test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
160 test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err &&
161 test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
163 test_must_fail git reset --pathspec-file-nul 2>err &&
164 test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
166 test_must_fail git reset --soft --pathspec-from-file=list 2>err &&
167 test_i18ngrep -e "fatal: Cannot do soft reset with paths" err &&
169 test_must_fail git reset --hard --pathspec-from-file=list 2>err &&
170 test_i18ngrep -e "fatal: Cannot do hard reset with paths" err
173 test_done