3 test_description
='pushing to a repository using the atomic push option'
5 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
=main
6 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
11 rm -rf workbench upstream
&&
12 test_create_repo upstream
&&
13 test_create_repo workbench
&&
16 git config receive.denyCurrentBranch warn
20 git remote add up ..
/upstream
24 # Compare the ref ($1) in upstream with a ref value from workbench ($2)
25 # i.e. test_refs second HEAD@{2}
28 git
-C upstream rev-parse
--verify "$1" >expect
&&
29 git
-C workbench rev-parse
--verify "$2" >actual
&&
30 test_cmp expect actual
33 fmt_status_report
() {
35 -e "/^To / { s/ */ /g; p; }" \
36 -e "/^ ! / { s/ */ /g; p; }"
39 test_expect_success
'atomic push works for a single branch' '
44 git push --mirror up &&
46 git push --atomic up main
51 test_expect_success
'atomic push works for two branches' '
57 git push --mirror up &&
59 git checkout second &&
61 git push --atomic up main second
63 test_refs main main &&
64 test_refs second second
67 test_expect_success
'atomic push works in combination with --mirror' '
72 git checkout -b second &&
74 git push --atomic --mirror up
76 test_refs main main &&
77 test_refs second second
80 test_expect_success
'atomic push works in combination with --force' '
85 git branch second main &&
87 git checkout second &&
89 test_commit three_b &&
91 git push --mirror up &&
92 # The actual test is below
94 test_commit three_a &&
95 git checkout second &&
96 git reset --hard HEAD^ &&
97 git push --force --atomic up main second
99 test_refs main main &&
100 test_refs second second
103 # set up two branches where main can be pushed but second can not
104 # (non-fast-forward). Since second can not be pushed the whole operation
105 # will fail and leave main untouched.
106 test_expect_success
'atomic push fails if one branch fails' '
111 git checkout -b second main &&
115 git push --mirror up &&
116 git reset --hard HEAD~2 &&
120 test_must_fail git push --atomic --all up
122 test_refs main HEAD@{7} &&
123 test_refs second HEAD@{4}
126 test_expect_success
'atomic push fails if one tag fails remotely' '
132 git checkout -b second main &&
136 # a third party modifies the server side:
139 git checkout second &&
140 git tag test_tag second
142 # see if we can now push both branches.
147 git checkout second &&
150 test_must_fail git push --tags --atomic up main second
152 test_refs main HEAD@{3} &&
153 test_refs second HEAD@{1}
156 test_expect_success
'atomic push obeys update hook preventing a branch to be pushed' '
161 git checkout -b second main &&
165 test_hook -C upstream update <<-\EOF &&
166 # only allow update to main from now on
167 test "$1" = "refs/heads/main"
173 git checkout second &&
175 test_must_fail git push --atomic up main second
177 test_refs main HEAD@{3} &&
178 test_refs second HEAD@{1}
181 test_expect_success
'atomic push is not advertised if configured' '
185 git config receive.advertiseatomic 0
190 git push --mirror up &&
192 test_must_fail git push --atomic up main
194 test_refs main HEAD@{1}
197 # References in upstream : main(1) one(1) foo(1)
198 # References in workbench: main(2) foo(1) two(2) bar(2)
199 # Atomic push : main(2) two(2) bar(2)
200 test_expect_success
'atomic push reports (reject by update hook)' '
206 git push up main one foo &&
210 mkdir -p upstream/.git/hooks &&
211 cat >upstream/.git/hooks/update <<-EOF &&
214 if test "\$1" = "refs/heads/bar"
216 echo >&2 "Pusing to branch bar is prohibited"
220 chmod a+x upstream/.git/hooks/update
227 test_must_fail git -C workbench \
228 push --atomic up main two bar >out 2>&1 &&
229 fmt_status_report <out >actual &&
230 cat >expect <<-EOF &&
232 ! [remote rejected] main -> main (atomic push failure)
233 ! [remote rejected] two -> two (atomic push failure)
234 ! [remote rejected] bar -> bar (hook declined)
236 test_cmp expect actual
239 # References in upstream : main(1) one(1) foo(1)
240 # References in workbench: main(2) foo(1) two(2) bar(2)
241 test_expect_success
'atomic push reports (mirror, but reject by update hook)' '
244 git remote remove up &&
245 git remote add up ../upstream
247 test_must_fail git -C workbench \
248 push --atomic --mirror up >out 2>&1 &&
249 fmt_status_report <out >actual &&
250 cat >expect <<-EOF &&
252 ! [remote rejected] main -> main (atomic push failure)
253 ! [remote rejected] one (atomic push failure)
254 ! [remote rejected] bar -> bar (hook declined)
255 ! [remote rejected] two -> two (atomic push failure)
257 test_cmp expect actual
260 # References in upstream : main(2) one(1) foo(1)
261 # References in workbench: main(1) foo(1) two(2) bar(2)
262 test_expect_success
'atomic push reports (reject by non-ff)' '
263 rm upstream/.git/hooks/update &&
267 git reset --hard HEAD^
269 test_must_fail git -C workbench \
270 push --atomic up main foo bar >out 2>&1 &&
271 fmt_status_report <out >actual &&
272 cat >expect <<-EOF &&
274 ! [rejected] main -> main (non-fast-forward)
275 ! [rejected] bar -> bar (atomic push failed)
277 test_cmp expect actual