blob: 7a80e47c2b70a8cf64c71fa00289b5abfc158151 (
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
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
|
#!/bin/sh
# Copyright (c) 2020, Jacob Keller.
test_description='"git fetch" with negative refspecs.
'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
test_expect_success setup '
echo >file original &&
git add file &&
git commit -a -m original
'
test_expect_success "clone and setup child repos" '
git clone . one &&
(
cd one &&
echo >file updated by one &&
git commit -a -m "updated by one" &&
git switch -c alternate &&
echo >file updated again by one &&
git commit -a -m "updated by one again" &&
git switch main
) &&
git clone . two &&
(
cd two &&
git config branch.main.remote one &&
git config remote.one.url ../one/.git/ &&
git config remote.one.fetch +refs/heads/*:refs/remotes/one/* &&
git config --add remote.one.fetch ^refs/heads/alternate
) &&
git clone . three
'
test_expect_success "fetch one" '
echo >file updated by origin &&
git commit -a -m "updated by origin" &&
(
cd two &&
test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
git fetch one &&
test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
git rev-parse --verify refs/remotes/one/main &&
mine=$(git rev-parse refs/remotes/one/main) &&
his=$(cd ../one && git rev-parse refs/heads/main) &&
test "z$mine" = "z$his"
)
'
test_expect_success "fetch with negative refspec on commandline" '
echo >file updated by origin again &&
git commit -a -m "updated by origin again" &&
(
cd three &&
alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
echo $alternate_in_one >expect &&
git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/main &&
cut -f -1 .git/FETCH_HEAD >actual &&
test_cmp expect actual
)
'
test_expect_success "fetch with negative sha1 refspec fails" '
echo >file updated by origin yet again &&
git commit -a -m "updated by origin yet again" &&
(
cd three &&
main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
test_must_fail git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^$main_in_one
)
'
test_expect_success "fetch with negative pattern refspec" '
echo >file updated by origin once more &&
git commit -a -m "updated by origin once more" &&
(
cd three &&
alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
echo $alternate_in_one >expect &&
git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/m* &&
cut -f -1 .git/FETCH_HEAD >actual &&
test_cmp expect actual
)
'
test_expect_success "fetch with negative pattern refspec does not expand prefix" '
echo >file updated by origin another time &&
git commit -a -m "updated by origin another time" &&
(
cd three &&
alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
echo $alternate_in_one >expect &&
echo $main_in_one >>expect &&
git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^main &&
cut -f -1 .git/FETCH_HEAD >actual &&
test_cmp expect actual
)
'
test_expect_success "fetch with negative refspec avoids duplicate conflict" '
(
cd one &&
git branch dups/a &&
git branch dups/b &&
git branch dups/c &&
git branch other/a &&
git rev-parse --verify refs/heads/other/a >../expect &&
git rev-parse --verify refs/heads/dups/b >>../expect &&
git rev-parse --verify refs/heads/dups/c >>../expect
) &&
(
cd three &&
git fetch ../one/.git ^refs/heads/dups/a refs/heads/dups/*:refs/dups/* refs/heads/other/a:refs/dups/a &&
git rev-parse --verify refs/dups/a >../actual &&
git rev-parse --verify refs/dups/b >>../actual &&
git rev-parse --verify refs/dups/c >>../actual
) &&
test_cmp expect actual
'
test_expect_success "push --prune with negative refspec" '
(
cd two &&
git branch prune/a &&
git branch prune/b &&
git branch prune/c &&
git push ../three refs/heads/prune/* &&
git branch -d prune/a &&
git branch -d prune/b &&
git push --prune ../three refs/heads/prune/* ^refs/heads/prune/b
) &&
(
cd three &&
test_write_lines b c >expect &&
git for-each-ref --format="%(refname:lstrip=3)" refs/heads/prune/ >actual &&
test_cmp expect actual
)
'
test_expect_success "push --prune with negative refspec apply to the destination" '
(
cd two &&
git branch ours/a &&
git branch ours/b &&
git branch ours/c &&
git push ../three refs/heads/ours/*:refs/heads/theirs/* &&
git branch -d ours/a &&
git branch -d ours/b &&
git push --prune ../three refs/heads/ours/*:refs/heads/theirs/* ^refs/heads/theirs/b
) &&
(
cd three &&
test_write_lines b c >expect &&
git for-each-ref --format="%(refname:lstrip=3)" refs/heads/theirs/ >actual &&
test_cmp expect actual
)
'
test_expect_success "fetch --prune with negative refspec" '
(
cd two &&
git branch fetch/a &&
git branch fetch/b &&
git branch fetch/c
) &&
(
cd three &&
git fetch ../two/.git refs/heads/fetch/*:refs/heads/copied/*
) &&
(
cd two &&
git branch -d fetch/a &&
git branch -d fetch/b
) &&
(
cd three &&
test_write_lines b c >expect &&
git fetch -v ../two/.git --prune refs/heads/fetch/*:refs/heads/copied/* ^refs/heads/fetch/b &&
git for-each-ref --format="%(refname:lstrip=3)" refs/heads/copied/ >actual &&
test_cmp expect actual
)
'
test_expect_success "push with matching : and negative refspec" '
# Manually handle cleanup, since test_config is not
# prepared to take arbitrary options like --add
test_when_finished "test_unconfig -C two remote.one.push" &&
# For convenience, we use "master" to refer to the name of
# the branch created by default in the following.
#
# Repositories two and one have branches other than "master"
# but they have no overlap---"master" is the only one that
# is shared between them. And the master branch at two is
# behind the master branch at one by one commit.
git -C two config --add remote.one.push : &&
# A matching push tries to update master, fails due to non-ff
test_must_fail git -C two push one &&
# "master" may actually not be "master"---find it out.
current=$(git symbolic-ref HEAD) &&
# If master is in negative refspec, then the command will not attempt
# to push and succeed.
git -C two config --add remote.one.push "^$current" &&
# With "master" excluded, this push is a no-op. Nothing gets
# pushed and it succeeds.
git -C two push -v one
'
test_expect_success "push with matching +: and negative refspec" '
test_when_finished "test_unconfig -C two remote.one.push" &&
# The same set-up as above, whose side-effect was a no-op.
git -C two config --add remote.one.push +: &&
# The push refuses to update the "master" branch that is checked
# out in the "one" repository, even when it is forced with +:
test_must_fail git -C two push one &&
# "master" may actually not be "master"---find it out.
current=$(git symbolic-ref HEAD) &&
# If master is in negative refspec, then the command will not attempt
# to push and succeed
git -C two config --add remote.one.push "^$current" &&
# With "master" excluded, this push is a no-op. Nothing gets
# pushed and it succeeds.
git -C two push -v one
'
test_expect_success '--prefetch correctly modifies refspecs' '
git -C one config --unset-all remote.origin.fetch &&
git -C one config --add remote.origin.fetch ^refs/heads/bogus/ignore &&
git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
git -C one config --add remote.origin.fetch "refs/heads/bogus/*:bogus/*" &&
git tag -a -m never never-fetch-tag HEAD &&
git branch bogus/fetched HEAD~1 &&
git branch bogus/ignore HEAD &&
git -C one fetch --prefetch --no-tags &&
test_must_fail git -C one rev-parse never-fetch-tag &&
git -C one rev-parse refs/prefetch/bogus/fetched &&
test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore &&
# correctly handle when refspec set becomes empty
# after removing the refs/tags/* refspec.
git -C one config --unset-all remote.origin.fetch &&
git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
git -C one fetch --prefetch --no-tags &&
test_must_fail git -C one rev-parse never-fetch-tag &&
# The refspec for refs that are not fully qualified
# are filtered multiple times.
git -C one rev-parse refs/prefetch/bogus/fetched &&
test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore
'
test_expect_success '--prefetch succeeds when refspec becomes empty' '
git checkout bogus/fetched &&
test_commit extra &&
git -C one config --unset-all remote.origin.fetch &&
git -C one config --unset branch.main.remote &&
git -C one config remote.origin.fetch "+refs/tags/extra" &&
git -C one config remote.origin.skipfetchall true &&
git -C one config remote.origin.tagopt "--no-tags" &&
git -C one fetch --prefetch
'
test_done
|
