3 test_description
='check various push.default settings'
4 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
=main
5 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9 test_expect_success
'setup bare remotes' '
10 git init --bare repo1 &&
11 git remote add parent1 repo1 &&
12 git init --bare repo2 &&
13 git remote add parent2 repo2 &&
15 git push parent1 HEAD &&
20 # $2 = remote revision (tested to be equal to the local one)
21 # $3 = [optional] repo to check for actual output (repo1 by default)
22 check_pushed_commit
() {
23 git log
-1 --format='%h %s' "$1" >expect
&&
24 git
--git-dir="${3:-repo1}" log
-1 --format='%h %s' "$2" >actual
&&
25 test_cmp expect actual
28 # $1 = push.default value
29 # $2 = expected target branch for the push
30 # $3 = [optional] repo to check for actual output (repo1 by default)
31 test_push_success
() {
32 git
${1:+-c} ${1:+push.default="$1"} push
&&
33 check_pushed_commit HEAD
"$2" "$3"
36 # $1 = push.default value
37 # check that push fails and does not modify any remote branch
38 test_push_failure
() {
39 git
--git-dir=repo1 log
--no-walk --format='%h %s' --all >expect
&&
40 test_must_fail git
${1:+-c} ${1:+push.default="$1"} push
&&
41 git
--git-dir=repo1 log
--no-walk --format='%h %s' --all >actual
&&
42 test_cmp expect actual
45 # $1 = success or failure
46 # $2 = push.default value
47 # $3 = branch to check for actual output (main or foo)
48 # $4 = [optional] switch to triangular workflow
49 test_pushdefault_workflow
() {
52 if test -n "${4-}"; then
56 test_expect_success
"push.default = $2 $1 in $workflow workflows" "
57 test_config branch.main.remote parent1 &&
58 test_config branch.main.merge refs/heads/foo &&
59 test_config remote.pushdefault $pushdefault &&
60 test_commit commit-for-$2${4+-triangular} &&
61 test_push_$1 $2 $3 ${4+repo2}
65 test_expect_success
'"upstream" pushes to configured upstream' '
67 test_config branch.main.remote parent1 &&
68 test_config branch.main.merge refs/heads/foo &&
70 test_push_success upstream foo
73 test_expect_success
'"upstream" does not push on unconfigured remote' '
75 test_unconfig branch.main.remote &&
77 test_push_failure upstream
80 test_expect_success
'"upstream" does not push on unconfigured branch' '
82 test_config branch.main.remote parent1 &&
83 test_unconfig branch.main.merge &&
85 test_push_failure upstream
88 test_expect_success
'"upstream" does not push when remotes do not match' '
90 test_config branch.main.remote parent1 &&
91 test_config branch.main.merge refs/heads/foo &&
92 test_config push.default upstream &&
94 test_must_fail git push parent2
97 test_expect_success
'push from/to new branch with upstream, matching and simple' '
98 git checkout -b new-branch &&
99 test_push_failure simple &&
100 test_push_failure matching &&
101 test_push_failure upstream
104 test_expect_success
'"matching" fails if none match' '
105 git init --bare empty &&
106 test_must_fail git push empty : 2>actual &&
107 test_i18ngrep "Perhaps you should specify a branch" actual
110 test_expect_success
'push ambiguously named branch with upstream, matching and simple' '
111 git checkout -b ambiguous &&
112 test_config branch.ambiguous.remote parent1 &&
113 test_config branch.ambiguous.merge refs/heads/ambiguous &&
115 test_push_success simple ambiguous &&
116 test_push_success matching ambiguous &&
117 test_push_success upstream ambiguous
120 test_expect_success
'push from/to new branch with current creates remote branch' '
121 test_config branch.new-branch.remote repo1 &&
122 git checkout new-branch &&
123 test_push_success current new-branch
126 test_expect_success
'push to existing branch, with no upstream configured' '
127 test_config branch.main.remote repo1 &&
129 test_push_failure simple &&
130 test_push_failure upstream
133 test_expect_success
'push to existing branch, upstream configured with same name' '
134 test_config branch.main.remote repo1 &&
135 test_config branch.main.merge refs/heads/main &&
138 test_push_success upstream main &&
140 test_push_success simple main
143 test_expect_success
'push to existing branch, upstream configured with different name' '
144 test_config branch.main.remote repo1 &&
145 test_config branch.main.merge refs/heads/other-name &&
148 test_push_success upstream other-name &&
150 test_push_failure simple &&
151 git --git-dir=repo1 log -1 --format="%h %s" "other-name" >expect-other-name &&
152 test_push_success current main &&
153 git --git-dir=repo1 log -1 --format="%h %s" "other-name" >actual-other-name &&
154 test_cmp expect-other-name actual-other-name
157 # We are on 'main', which integrates with 'foo' from parent1
158 # remote (set in test_pushdefault_workflow helper). Push to
159 # parent1 in centralized, and push to parent2 in triangular workflow.
160 # The parent1 repository has 'main' and 'foo' branches, while
161 # the parent2 repository has only 'main' branch.
163 # test_pushdefault_workflow() arguments:
164 # $1 = success or failure
165 # $2 = push.default value
166 # $3 = branch to check for actual output (main or foo)
167 # $4 = [optional] switch to triangular workflow
169 # update parent1's main (which is not our upstream)
170 test_pushdefault_workflow success current main
172 # update parent1's foo (which is our upstream)
173 test_pushdefault_workflow success upstream foo
175 # upstream is foo which is not the name of the current branch
176 test_pushdefault_workflow failure simple main
178 # main and foo are updated
179 test_pushdefault_workflow success matching main
182 test_pushdefault_workflow success current main triangular
184 # upstream mode cannot be used in triangular
185 test_pushdefault_workflow failure upstream foo triangular
187 # in triangular, 'simple' works as 'current' and update the branch
188 # with the same name.
189 test_pushdefault_workflow success simple main triangular
191 # main is updated (parent2 does not have foo)
192 test_pushdefault_workflow success matching main triangular
194 # default tests, when no push-default is specified. This
195 # should behave the same as "simple" in non-triangular
196 # settings, and as "current" otherwise.
198 test_expect_success
'default behavior allows "simple" push' '
199 test_config branch.main.remote parent1 &&
200 test_config branch.main.merge refs/heads/main &&
201 test_config remote.pushdefault parent1 &&
202 test_commit default-main-main &&
203 test_push_success "" main
206 test_expect_success
'default behavior rejects non-simple push' '
207 test_config branch.main.remote parent1 &&
208 test_config branch.main.merge refs/heads/foo &&
209 test_config remote.pushdefault parent1 &&
210 test_commit default-main-foo &&
214 test_expect_success
'default triangular behavior acts like "current"' '
215 test_config branch.main.remote parent1 &&
216 test_config branch.main.merge refs/heads/foo &&
217 test_config remote.pushdefault parent2 &&
218 test_commit default-triangular &&
219 test_push_success "" main repo2