Merge branch 'rs/diff-parseopts-cleanup'
[git/gitster.git] / t / t5553-set-upstream.sh
blob48050162c27440dab8a0dbc5cd19a2781bee2d37
1 #!/bin/sh
3 test_description='"git fetch/pull --set-upstream" basic tests.'
4 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
5 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7 . ./test-lib.sh
9 check_config () {
10 printf "%s\n" "$2" "$3" >"expect.$1" &&
12 git config "branch.$1.remote" && git config "branch.$1.merge"
13 } >"actual.$1" &&
14 test_cmp "expect.$1" "actual.$1"
17 check_config_missing () {
18 test_expect_code 1 git config "branch.$1.remote" &&
19 test_expect_code 1 git config "branch.$1.merge"
22 clear_config () {
23 for branch in "$@"; do
24 test_might_fail git config --unset-all "branch.$branch.remote"
25 test_might_fail git config --unset-all "branch.$branch.merge"
26 done
29 ensure_fresh_upstream () {
30 rm -rf parent && git init --bare parent
33 test_expect_success 'setup bare parent fetch' '
34 ensure_fresh_upstream &&
35 git remote add upstream parent
38 test_expect_success 'setup commit on main and other fetch' '
39 test_commit one &&
40 git push upstream main &&
41 git checkout -b other &&
42 test_commit two &&
43 git push upstream other
46 # tests for fetch --set-upstream
48 test_expect_success 'fetch --set-upstream does not set upstream w/o branch' '
49 clear_config main other &&
50 git checkout main &&
51 git fetch --set-upstream upstream &&
52 check_config_missing main &&
53 check_config_missing other
56 test_expect_success 'fetch --set-upstream upstream main sets branch main but not other' '
57 clear_config main other &&
58 git fetch --set-upstream upstream main &&
59 check_config main upstream refs/heads/main &&
60 check_config_missing other
63 test_expect_success 'fetch --set-upstream upstream other sets branch other' '
64 clear_config main other &&
65 git fetch --set-upstream upstream other &&
66 check_config main upstream refs/heads/other &&
67 check_config_missing other
70 test_expect_success 'fetch --set-upstream main:other does not set the branch other2' '
71 clear_config other2 &&
72 git fetch --set-upstream upstream main:other2 &&
73 check_config_missing other2
76 test_expect_success 'fetch --set-upstream http://nosuchdomain.example.com fails with invalid url' '
77 # main explicitly not cleared, we check that it is not touched from previous value
78 clear_config other other2 &&
79 test_must_fail git fetch --set-upstream http://nosuchdomain.example.com &&
80 check_config main upstream refs/heads/other &&
81 check_config_missing other &&
82 check_config_missing other2
85 test_expect_success 'fetch --set-upstream with valid URL sets upstream to URL' '
86 clear_config other other2 &&
87 url="file://$PWD" &&
88 git fetch --set-upstream "$url" &&
89 check_config main "$url" HEAD &&
90 check_config_missing other &&
91 check_config_missing other2
94 test_expect_success 'fetch --set-upstream with a detached HEAD' '
95 git checkout HEAD^0 &&
96 test_when_finished "git checkout -" &&
97 cat >expect <<-\EOF &&
98 warning: could not set upstream of HEAD to '"'"'main'"'"' from '"'"'upstream'"'"' when it does not point to any branch.
99 EOF
100 git fetch --set-upstream upstream main 2>actual.raw &&
101 grep ^warning: actual.raw >actual &&
102 test_cmp expect actual
105 # tests for pull --set-upstream
107 test_expect_success 'setup bare parent pull' '
108 git remote rm upstream &&
109 ensure_fresh_upstream &&
110 git remote add upstream parent
113 test_expect_success 'setup commit on main and other pull' '
114 test_commit three &&
115 git push --tags upstream main &&
116 test_commit four &&
117 git push upstream other
120 test_expect_success 'pull --set-upstream upstream main sets branch main but not other' '
121 clear_config main other &&
122 git pull --no-rebase --set-upstream upstream main &&
123 check_config main upstream refs/heads/main &&
124 check_config_missing other
127 test_expect_success 'pull --set-upstream main:other2 does not set the branch other2' '
128 clear_config other2 &&
129 git pull --no-rebase --set-upstream upstream main:other2 &&
130 check_config_missing other2
133 test_expect_success 'pull --set-upstream upstream other sets branch main' '
134 clear_config main other &&
135 git pull --no-rebase --set-upstream upstream other &&
136 check_config main upstream refs/heads/other &&
137 check_config_missing other
140 test_expect_success 'pull --set-upstream upstream tag does not set the tag' '
141 clear_config three &&
142 git pull --no-rebase --tags --set-upstream upstream three &&
143 check_config_missing three
146 test_expect_success 'pull --set-upstream http://nosuchdomain.example.com fails with invalid url' '
147 # main explicitly not cleared, we check that it is not touched from previous value
148 clear_config other other2 three &&
149 test_must_fail git pull --set-upstream http://nosuchdomain.example.com &&
150 check_config main upstream refs/heads/other &&
151 check_config_missing other &&
152 check_config_missing other2 &&
153 check_config_missing three
156 test_expect_success 'pull --set-upstream upstream HEAD sets branch HEAD' '
157 clear_config main other &&
158 git pull --no-rebase --set-upstream upstream HEAD &&
159 check_config main upstream HEAD &&
160 git checkout other &&
161 git pull --no-rebase --set-upstream upstream HEAD &&
162 check_config other upstream HEAD
165 test_expect_success 'pull --set-upstream upstream with more than one branch does nothing' '
166 clear_config main three &&
167 git pull --no-rebase --set-upstream upstream main three &&
168 check_config_missing main &&
169 check_config_missing three
172 test_expect_success 'pull --set-upstream with valid URL sets upstream to URL' '
173 clear_config main other other2 &&
174 git checkout main &&
175 url="file://$PWD" &&
176 git pull --set-upstream "$url" &&
177 check_config main "$url" HEAD &&
178 check_config_missing other &&
179 check_config_missing other2
182 test_expect_success 'pull --set-upstream with valid URL and branch sets branch' '
183 clear_config main other other2 &&
184 git checkout main &&
185 url="file://$PWD" &&
186 git pull --set-upstream "$url" main &&
187 check_config main "$url" refs/heads/main &&
188 check_config_missing other &&
189 check_config_missing other2
192 test_expect_success 'pull --set-upstream with a detached HEAD' '
193 git checkout HEAD^0 &&
194 test_when_finished "git checkout -" &&
195 cat >expect <<-\EOF &&
196 warning: could not set upstream of HEAD to '"'"'main'"'"' from '"'"'upstream'"'"' when it does not point to any branch.
198 git pull --no-rebase --set-upstream upstream main 2>actual.raw &&
199 grep ^warning: actual.raw >actual &&
200 test_cmp expect actual
203 test_done