3 test_description
='compare & swap push force/delete safety'
7 setup_srcdst_basic
() {
9 git clone
--no-local . src
&&
10 git clone
--no-local src dst
&&
12 cd src
&& git checkout HEAD^
0
16 test_expect_success setup
'
17 # create template repository
23 test_expect_success
'push to update (protected)' '
28 test_must_fail git push --force-with-lease=master:master origin master 2>err &&
31 git ls-remote . refs/heads/master >expect &&
32 git ls-remote src refs/heads/master >actual &&
33 test_cmp expect actual
36 test_expect_success
'push to update (protected, forced)' '
41 git push --force --force-with-lease=master:master origin master 2>err &&
42 grep "forced update" err
44 git ls-remote dst refs/heads/master >expect &&
45 git ls-remote src refs/heads/master >actual &&
46 test_cmp expect actual
49 test_expect_success
'push to update (protected, tracking)' '
53 git checkout master &&
57 git ls-remote src refs/heads/master >expect &&
61 git ls-remote . refs/remotes/origin/master >expect &&
62 test_must_fail git push --force-with-lease=master origin master &&
63 git ls-remote . refs/remotes/origin/master >actual &&
64 test_cmp expect actual
66 git ls-remote src refs/heads/master >actual &&
67 test_cmp expect actual
70 test_expect_success
'push to update (protected, tracking, forced)' '
74 git checkout master &&
81 git ls-remote . refs/remotes/origin/master >expect &&
82 git push --force --force-with-lease=master origin master
84 git ls-remote dst refs/heads/master >expect &&
85 git ls-remote src refs/heads/master >actual &&
86 test_cmp expect actual
89 test_expect_success
'push to update (allowed)' '
94 git push --force-with-lease=master:master^ origin master
96 git ls-remote dst refs/heads/master >expect &&
97 git ls-remote src refs/heads/master >actual &&
98 test_cmp expect actual
101 test_expect_success
'push to update (allowed, tracking)' '
102 setup_srcdst_basic &&
106 git push --force-with-lease=master origin master 2>err &&
107 ! grep "forced update" err
109 git ls-remote dst refs/heads/master >expect &&
110 git ls-remote src refs/heads/master >actual &&
111 test_cmp expect actual
114 test_expect_success
'push to update (allowed even though no-ff)' '
115 setup_srcdst_basic &&
118 git reset --hard HEAD^ &&
120 git push --force-with-lease=master origin master 2>err &&
121 grep "forced update" err
123 git ls-remote dst refs/heads/master >expect &&
124 git ls-remote src refs/heads/master >actual &&
125 test_cmp expect actual
128 test_expect_success
'push to delete (protected)' '
129 setup_srcdst_basic &&
130 git ls-remote src refs/heads/master >expect &&
133 test_must_fail git push --force-with-lease=master:master^ origin :master
135 git ls-remote src refs/heads/master >actual &&
136 test_cmp expect actual
139 test_expect_success
'push to delete (protected, forced)' '
140 setup_srcdst_basic &&
143 git push --force --force-with-lease=master:master^ origin :master
146 git ls-remote src refs/heads/master >actual &&
147 test_cmp expect actual
150 test_expect_success
'push to delete (allowed)' '
151 setup_srcdst_basic &&
154 git push --force-with-lease=master origin :master 2>err &&
158 git ls-remote src refs/heads/master >actual &&
159 test_cmp expect actual
162 test_expect_success
'cover everything with default force-with-lease (protected)' '
163 setup_srcdst_basic &&
166 git branch naster master^
168 git ls-remote src refs/heads/\* >expect &&
171 test_must_fail git push --force-with-lease origin master master:naster
173 git ls-remote src refs/heads/\* >actual &&
174 test_cmp expect actual
177 test_expect_success
'cover everything with default force-with-lease (allowed)' '
178 setup_srcdst_basic &&
181 git branch naster master^
186 git push --force-with-lease origin master master:naster
188 git ls-remote dst refs/heads/master |
189 sed -e "s/master/naster/" >expect &&
190 git ls-remote src refs/heads/naster >actual &&
191 test_cmp expect actual
194 test_expect_success
'new branch covered by force-with-lease' '
195 setup_srcdst_basic &&
198 git branch branch master &&
199 git push --force-with-lease=branch origin branch
201 git ls-remote dst refs/heads/branch >expect &&
202 git ls-remote src refs/heads/branch >actual &&
203 test_cmp expect actual
206 test_expect_success
'new branch covered by force-with-lease (explicit)' '
207 setup_srcdst_basic &&
210 git branch branch master &&
211 git push --force-with-lease=branch: origin branch
213 git ls-remote dst refs/heads/branch >expect &&
214 git ls-remote src refs/heads/branch >actual &&
215 test_cmp expect actual
218 test_expect_success
'new branch already exists' '
219 setup_srcdst_basic &&
222 git checkout -b branch master &&
227 git branch branch master &&
228 test_must_fail git push --force-with-lease=branch: origin branch
232 test_expect_success
'background updates of REMOTE can be mitigated with a non-updated REMOTE-push' '
234 git init --bare src.bare &&
235 test_when_finished "rm -rf src.bare" &&
236 git clone --no-local src.bare dst &&
237 test_when_finished "rm -rf dst" &&
241 git remote add origin-push ../src.bare &&
242 git push origin-push master:master
244 git clone --no-local src.bare dst2 &&
245 test_when_finished "rm -rf dst2" &&
255 test_must_fail git push --force-with-lease origin-push &&
256 git fetch origin-push &&
257 git push --force-with-lease origin-push