blob: 523efbecde1dff517ffebf3c04cfcf74ea280f15 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
|
#!/bin/sh
test_description='reset --pathspec-from-file'
. ./test-lib.sh
test_tick
test_expect_success setup '
echo A >fileA.t &&
echo B >fileB.t &&
echo C >fileC.t &&
echo D >fileD.t &&
git add . &&
git commit --include . -m "Commit" &&
git tag checkpoint
'
restore_checkpoint () {
git reset --hard checkpoint
}
verify_expect () {
git status --porcelain -- fileA.t fileB.t fileC.t fileD.t >actual &&
if test "x$1" = 'x!'
then
! test_cmp expect actual
else
test_cmp expect actual
fi
}
test_expect_success '--pathspec-from-file from stdin' '
restore_checkpoint &&
git rm fileA.t &&
echo fileA.t | git reset --pathspec-from-file=- &&
cat >expect <<-\EOF &&
D fileA.t
EOF
verify_expect
'
test_expect_success '--pathspec-from-file from file' '
restore_checkpoint &&
git rm fileA.t &&
echo fileA.t >list &&
git reset --pathspec-from-file=list &&
cat >expect <<-\EOF &&
D fileA.t
EOF
verify_expect
'
test_expect_success 'NUL delimiters' '
restore_checkpoint &&
git rm fileA.t fileB.t &&
printf "fileA.t\0fileB.t\0" | git reset --pathspec-from-file=- --pathspec-file-nul &&
cat >expect <<-\EOF &&
D fileA.t
D fileB.t
EOF
verify_expect
'
test_expect_success 'LF delimiters' '
restore_checkpoint &&
git rm fileA.t fileB.t &&
printf "fileA.t\nfileB.t\n" | git reset --pathspec-from-file=- &&
cat >expect <<-\EOF &&
D fileA.t
D fileB.t
EOF
verify_expect
'
test_expect_success 'no trailing delimiter' '
restore_checkpoint &&
git rm fileA.t fileB.t &&
printf "fileA.t\nfileB.t" | git reset --pathspec-from-file=- &&
cat >expect <<-\EOF &&
D fileA.t
D fileB.t
EOF
verify_expect
'
test_expect_success 'CRLF delimiters' '
restore_checkpoint &&
git rm fileA.t fileB.t &&
printf "fileA.t\r\nfileB.t\r\n" | git reset --pathspec-from-file=- &&
cat >expect <<-\EOF &&
D fileA.t
D fileB.t
EOF
verify_expect
'
test_expect_success 'quotes' '
restore_checkpoint &&
cat >list <<-\EOF &&
"file\101.t"
EOF
git rm fileA.t &&
git reset --pathspec-from-file=list &&
cat >expect <<-\EOF &&
D fileA.t
EOF
verify_expect
'
test_expect_success 'quotes not compatible with --pathspec-file-nul' '
restore_checkpoint &&
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 &&
cat >expect <<-\EOF &&
D fileA.t
EOF
verify_expect !
'
test_expect_success 'only touches what was listed' '
restore_checkpoint &&
git rm fileA.t fileB.t fileC.t fileD.t &&
printf "fileB.t\nfileC.t\n" | git reset --pathspec-from-file=- &&
cat >expect <<-\EOF &&
D fileA.t
D fileB.t
D fileC.t
D fileD.t
EOF
verify_expect
'
test_expect_success 'error conditions' '
restore_checkpoint &&
echo fileA.t >list &&
git rm fileA.t &&
test_must_fail git reset --pathspec-from-file=list --patch 2>err &&
test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err &&
test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git reset --pathspec-file-nul 2>err &&
test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
test_must_fail git reset --soft --pathspec-from-file=list 2>err &&
test_i18ngrep -e "fatal: Cannot do soft reset with paths" err &&
test_must_fail git reset --hard --pathspec-from-file=list 2>err &&
test_i18ngrep -e "fatal: Cannot do hard reset with paths" err
'
test_done
|
