]>
Commit | Line | Data |
---|---|---|
a3b427b9 AW |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Amos Waterland | |
4 | # | |
5 | ||
c2d17ba3 | 6 | test_description='git branch assorted tests' |
a3b427b9 | 7 | |
a3b427b9 AW |
8 | . ./test-lib.sh |
9 | ||
10 | test_expect_success \ | |
4c84f0dc | 11 | 'prepare a trivial repository' \ |
a3b427b9 | 12 | 'echo Hello > A && |
5be60078 | 13 | git update-index --add A && |
0cb0e143 | 14 | git commit -m "Initial commit." && |
9ed36cfa JS |
15 | echo World >> A && |
16 | git update-index --add A && | |
0cb0e143 | 17 | git commit -m "Second commit." && |
5be60078 | 18 | HEAD=$(git rev-parse --verify HEAD)' |
a3b427b9 | 19 | |
41ac414e JH |
20 | test_expect_success \ |
21 | 'git branch --help should not have created a bogus branch' ' | |
2f139044 | 22 | test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null && |
376eb14a | 23 | test_path_is_missing .git/refs/heads/--help |
41ac414e | 24 | ' |
a3b427b9 | 25 | |
1dacfbcf NTND |
26 | test_expect_success 'branch -h in broken repository' ' |
27 | mkdir broken && | |
28 | ( | |
29 | cd broken && | |
30 | git init && | |
31 | >.git/refs/heads/master && | |
32 | test_expect_code 129 git branch -h >usage 2>&1 | |
33 | ) && | |
9a001381 | 34 | test_i18ngrep "[Uu]sage" broken/usage |
1dacfbcf NTND |
35 | ' |
36 | ||
08db81a9 AR |
37 | test_expect_success \ |
38 | 'git branch abc should create a branch' \ | |
376eb14a | 39 | 'git branch abc && test_path_is_file .git/refs/heads/abc' |
08db81a9 AR |
40 | |
41 | test_expect_success \ | |
42 | 'git branch a/b/c should create a branch' \ | |
376eb14a | 43 | 'git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c' |
08db81a9 | 44 | |
d7fb7a37 | 45 | cat >expect <<EOF |
3749fde5 | 46 | $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master |
d7fb7a37 SP |
47 | EOF |
48 | test_expect_success \ | |
49 | 'git branch -l d/e/f should create a branch and a log' \ | |
50 | 'GIT_COMMITTER_DATE="2005-05-26 23:30" \ | |
5be60078 | 51 | git branch -l d/e/f && |
376eb14a JK |
52 | test_path_is_file .git/refs/heads/d/e/f && |
53 | test_path_is_file .git/logs/refs/heads/d/e/f && | |
4fdf71be | 54 | test_cmp expect .git/logs/refs/heads/d/e/f' |
d7fb7a37 SP |
55 | |
56 | test_expect_success \ | |
57 | 'git branch -d d/e/f should delete a branch and a log' \ | |
5be60078 | 58 | 'git branch -d d/e/f && |
376eb14a JK |
59 | test_path_is_missing .git/refs/heads/d/e/f && |
60 | test_path_is_missing .git/logs/refs/heads/d/e/f' | |
d7fb7a37 | 61 | |
9c7b0b3f CC |
62 | test_expect_success \ |
63 | 'git branch j/k should work after branch j has been deleted' \ | |
5be60078 JH |
64 | 'git branch j && |
65 | git branch -d j && | |
66 | git branch j/k' | |
9c7b0b3f CC |
67 | |
68 | test_expect_success \ | |
69 | 'git branch l should work after branch l/m has been deleted' \ | |
5be60078 JH |
70 | 'git branch l/m && |
71 | git branch -d l/m && | |
72 | git branch l' | |
9c7b0b3f | 73 | |
db85b3a7 SN |
74 | test_expect_success \ |
75 | 'git branch -m dumps usage' \ | |
76 | 'test_expect_code 129 git branch -m 2>err && | |
9a001381 | 77 | test_i18ngrep "[Uu]sage: git branch" err' |
db85b3a7 | 78 | |
c976d415 LH |
79 | test_expect_success \ |
80 | 'git branch -m m m/m should work' \ | |
5be60078 JH |
81 | 'git branch -l m && |
82 | git branch -m m m/m && | |
376eb14a | 83 | test_path_is_file .git/logs/refs/heads/m/m' |
c976d415 LH |
84 | |
85 | test_expect_success \ | |
86 | 'git branch -m n/n n should work' \ | |
5be60078 | 87 | 'git branch -l n/n && |
2f139044 | 88 | git branch -m n/n n && |
376eb14a | 89 | test_path_is_file .git/logs/refs/heads/n' |
c976d415 | 90 | |
41ac414e JH |
91 | test_expect_success 'git branch -m o/o o should fail when o/p exists' ' |
92 | git branch o/o && | |
5be60078 | 93 | git branch o/p && |
d492b31c | 94 | test_must_fail git branch -m o/o o |
41ac414e | 95 | ' |
c976d415 | 96 | |
41ac414e JH |
97 | test_expect_success 'git branch -m q r/q should fail when r exists' ' |
98 | git branch q && | |
99 | git branch r && | |
d492b31c | 100 | test_must_fail git branch -m q r/q |
41ac414e | 101 | ' |
c976d415 | 102 | |
55c4a673 CI |
103 | test_expect_success 'git branch -M foo bar should fail when bar is checked out' ' |
104 | git branch bar && | |
105 | git checkout -b foo && | |
106 | test_must_fail git branch -M bar foo | |
107 | ' | |
108 | ||
109 | test_expect_success 'git branch -M baz bam should succeed when baz is checked out' ' | |
110 | git checkout -b baz && | |
111 | git branch bam && | |
112 | git branch -M baz bam | |
113 | ' | |
114 | ||
3f59481e JN |
115 | test_expect_success 'git branch -M master should work when master is checked out' ' |
116 | git checkout master && | |
117 | git branch -M master | |
118 | ' | |
119 | ||
120 | test_expect_success 'git branch -M master master should work when master is checked out' ' | |
121 | git checkout master && | |
122 | git branch -M master master | |
123 | ' | |
124 | ||
125 | test_expect_success 'git branch -M master2 master2 should work when master is checked out' ' | |
126 | git checkout master && | |
127 | git branch master2 && | |
128 | git branch -M master2 master2 | |
129 | ' | |
130 | ||
cddd127b MG |
131 | test_expect_success 'git branch -v -d t should work' ' |
132 | git branch t && | |
376eb14a | 133 | test_path_is_file .git/refs/heads/t && |
cddd127b | 134 | git branch -v -d t && |
376eb14a | 135 | test_path_is_missing .git/refs/heads/t |
cddd127b MG |
136 | ' |
137 | ||
138 | test_expect_success 'git branch -v -m t s should work' ' | |
139 | git branch t && | |
376eb14a | 140 | test_path_is_file .git/refs/heads/t && |
cddd127b | 141 | git branch -v -m t s && |
376eb14a JK |
142 | test_path_is_missing .git/refs/heads/t && |
143 | test_path_is_file .git/refs/heads/s && | |
cddd127b MG |
144 | git branch -d s |
145 | ' | |
146 | ||
147 | test_expect_success 'git branch -m -d t s should fail' ' | |
148 | git branch t && | |
376eb14a | 149 | test_path_is_file .git/refs/heads/t && |
cddd127b MG |
150 | test_must_fail git branch -m -d t s && |
151 | git branch -d t && | |
376eb14a | 152 | test_path_is_missing .git/refs/heads/t |
cddd127b MG |
153 | ' |
154 | ||
155 | test_expect_success 'git branch --list -d t should fail' ' | |
156 | git branch t && | |
376eb14a | 157 | test_path_is_file .git/refs/heads/t && |
cddd127b MG |
158 | test_must_fail git branch --list -d t && |
159 | git branch -d t && | |
376eb14a | 160 | test_path_is_missing .git/refs/heads/t |
cddd127b MG |
161 | ' |
162 | ||
ebe31ef2 NTND |
163 | test_expect_success 'git branch --column' ' |
164 | COLUMNS=81 git branch --column=column >actual && | |
165 | cat >expected <<\EOF && | |
166 | a/b/c bam foo l * master n o/p r | |
167 | abc bar j/k m/m master2 o/o q | |
168 | EOF | |
169 | test_cmp expected actual | |
170 | ' | |
171 | ||
172 | test_expect_success 'git branch --column with an extremely long branch name' ' | |
173 | long=this/is/a/part/of/long/branch/name && | |
174 | long=z$long/$long/$long/$long && | |
175 | test_when_finished "git branch -d $long" && | |
176 | git branch $long && | |
177 | COLUMNS=80 git branch --column=column >actual && | |
178 | cat >expected <<EOF && | |
179 | a/b/c | |
180 | abc | |
181 | bam | |
182 | bar | |
183 | foo | |
184 | j/k | |
185 | l | |
186 | m/m | |
187 | * master | |
188 | master2 | |
189 | n | |
190 | o/o | |
191 | o/p | |
192 | q | |
193 | r | |
194 | $long | |
195 | EOF | |
196 | test_cmp expected actual | |
197 | ' | |
198 | ||
199 | test_expect_success 'git branch with column.*' ' | |
200 | git config column.ui column && | |
201 | git config column.branch "dense" && | |
202 | COLUMNS=80 git branch >actual && | |
203 | git config --unset column.branch && | |
204 | git config --unset column.ui && | |
205 | cat >expected <<\EOF && | |
206 | a/b/c bam foo l * master n o/p r | |
207 | abc bar j/k m/m master2 o/o q | |
208 | EOF | |
209 | test_cmp expected actual | |
210 | ' | |
211 | ||
212 | test_expect_success 'git branch --column -v should fail' ' | |
213 | test_must_fail git branch --column -v | |
214 | ' | |
215 | ||
216 | test_expect_success 'git branch -v with column.ui ignored' ' | |
217 | git config column.ui column && | |
218 | COLUMNS=80 git branch -v | cut -c -10 | sed "s/ *$//" >actual && | |
219 | git config --unset column.ui && | |
220 | cat >expected <<\EOF && | |
221 | a/b/c | |
222 | abc | |
223 | bam | |
224 | bar | |
225 | foo | |
226 | j/k | |
227 | l | |
228 | m/m | |
229 | * master | |
230 | master2 | |
231 | n | |
232 | o/o | |
233 | o/p | |
234 | q | |
235 | r | |
236 | EOF | |
237 | test_cmp expected actual | |
238 | ' | |
239 | ||
01ebb9dc GB |
240 | mv .git/config .git/config-saved |
241 | ||
08b984fb | 242 | test_expect_success 'git branch -m q q2 without config should succeed' ' |
5be60078 JH |
243 | git branch -m q q2 && |
244 | git branch -m q2 q | |
01ebb9dc GB |
245 | ' |
246 | ||
247 | mv .git/config-saved .git/config | |
248 | ||
5be60078 | 249 | git config branch.s/s.dummy Hello |
dc81c58c | 250 | |
c976d415 LH |
251 | test_expect_success \ |
252 | 'git branch -m s/s s should work when s/t is deleted' \ | |
5be60078 | 253 | 'git branch -l s/s && |
376eb14a | 254 | test_path_is_file .git/logs/refs/heads/s/s && |
5be60078 | 255 | git branch -l s/t && |
376eb14a | 256 | test_path_is_file .git/logs/refs/heads/s/t && |
5be60078 JH |
257 | git branch -d s/t && |
258 | git branch -m s/s s && | |
376eb14a | 259 | test_path_is_file .git/logs/refs/heads/s' |
c976d415 | 260 | |
dc81c58c | 261 | test_expect_success 'config information was renamed, too' \ |
5be60078 | 262 | "test $(git config branch.s.dummy) = Hello && |
d492b31c | 263 | test_must_fail git config branch.s/s/dummy" |
dc81c58c | 264 | |
566c7707 RS |
265 | test_expect_success 'deleting a symref' ' |
266 | git branch target && | |
267 | git symbolic-ref refs/heads/symref refs/heads/target && | |
268 | sha1=$(git rev-parse symref | cut -c 1-7) && | |
269 | echo "Deleted branch symref (was $sha1)." >expect && | |
270 | git branch -d symref >actual && | |
271 | test_path_is_file .git/refs/heads/target && | |
272 | test_path_is_missing .git/refs/heads/symref && | |
273 | test_i18ncmp expect actual | |
274 | ' | |
275 | ||
0fe700e3 RS |
276 | test_expect_success 'deleting a dangling symref' ' |
277 | git symbolic-ref refs/heads/dangling-symref nowhere && | |
278 | test_path_is_file .git/refs/heads/dangling-symref && | |
279 | echo "Deleted branch dangling-symref (was 0000000)." >expect && | |
280 | git branch -d dangling-symref >actual && | |
281 | test_path_is_missing .git/refs/heads/dangling-symref && | |
282 | test_i18ncmp expect actual | |
283 | ' | |
284 | ||
fa58186c | 285 | test_expect_success 'renaming a symref is not allowed' \ |
eca35a25 MV |
286 | ' |
287 | git symbolic-ref refs/heads/master2 refs/heads/master && | |
fa58186c MV |
288 | test_must_fail git branch -m master2 master3 && |
289 | git symbolic-ref refs/heads/master2 && | |
376eb14a JK |
290 | test_path_is_file .git/refs/heads/master && |
291 | test_path_is_missing .git/refs/heads/master3 | |
eca35a25 MV |
292 | ' |
293 | ||
704a3143 | 294 | test_expect_success SYMLINKS \ |
41ac414e JH |
295 | 'git branch -m u v should fail when the reflog for u is a symlink' ' |
296 | git branch -l u && | |
16c2bfbb LH |
297 | mv .git/logs/refs/heads/u real-u && |
298 | ln -s real-u .git/logs/refs/heads/u && | |
d492b31c | 299 | test_must_fail git branch -m u v |
41ac414e | 300 | ' |
16c2bfbb | 301 | |
0746d19a | 302 | test_expect_success 'test tracking setup via --track' \ |
5be60078 JH |
303 | 'git config remote.local.url . && |
304 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 305 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
5be60078 JH |
306 | git branch --track my1 local/master && |
307 | test $(git config branch.my1.remote) = local && | |
308 | test $(git config branch.my1.merge) = refs/heads/master' | |
0746d19a PB |
309 | |
310 | test_expect_success 'test tracking setup (non-wildcard, matching)' \ | |
5be60078 JH |
311 | 'git config remote.local.url . && |
312 | git config remote.local.fetch refs/heads/master:refs/remotes/local/master && | |
0cb0e143 | 313 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
5be60078 JH |
314 | git branch --track my4 local/master && |
315 | test $(git config branch.my4.remote) = local && | |
316 | test $(git config branch.my4.merge) = refs/heads/master' | |
0746d19a PB |
317 | |
318 | test_expect_success 'test tracking setup (non-wildcard, not matching)' \ | |
5be60078 JH |
319 | 'git config remote.local.url . && |
320 | git config remote.local.fetch refs/heads/s:refs/remotes/local/s && | |
0cb0e143 | 321 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
5be60078 JH |
322 | git branch --track my5 local/master && |
323 | ! test "$(git config branch.my5.remote)" = local && | |
324 | ! test "$(git config branch.my5.merge)" = refs/heads/master' | |
0746d19a PB |
325 | |
326 | test_expect_success 'test tracking setup via config' \ | |
5be60078 JH |
327 | 'git config branch.autosetupmerge true && |
328 | git config remote.local.url . && | |
329 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 330 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
5be60078 JH |
331 | git branch my3 local/master && |
332 | test $(git config branch.my3.remote) = local && | |
333 | test $(git config branch.my3.merge) = refs/heads/master' | |
0746d19a PB |
334 | |
335 | test_expect_success 'test overriding tracking setup via --no-track' \ | |
5be60078 JH |
336 | 'git config branch.autosetupmerge true && |
337 | git config remote.local.url . && | |
338 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 339 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
5be60078 JH |
340 | git branch --no-track my2 local/master && |
341 | git config branch.autosetupmerge false && | |
342 | ! test "$(git config branch.my2.remote)" = local && | |
343 | ! test "$(git config branch.my2.merge)" = refs/heads/master' | |
0746d19a | 344 | |
6f084a56 | 345 | test_expect_success 'no tracking without .fetch entries' \ |
9ed36cfa JS |
346 | 'git config branch.autosetupmerge true && |
347 | git branch my6 s && | |
348 | git config branch.automsetupmerge false && | |
6f084a56 JS |
349 | test -z "$(git config branch.my6.remote)" && |
350 | test -z "$(git config branch.my6.merge)"' | |
9debc324 | 351 | |
11f68d90 | 352 | test_expect_success 'test tracking setup via --track but deeper' \ |
5be60078 JH |
353 | 'git config remote.local.url . && |
354 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 355 | (git show-ref -q refs/remotes/local/o/o || git fetch local) && |
5be60078 JH |
356 | git branch --track my7 local/o/o && |
357 | test "$(git config branch.my7.remote)" = local && | |
358 | test "$(git config branch.my7.merge)" = refs/heads/o/o' | |
11f68d90 | 359 | |
f1eccbab | 360 | test_expect_success 'test deleting branch deletes branch config' \ |
5be60078 | 361 | 'git branch -d my7 && |
6f084a56 JS |
362 | test -z "$(git config branch.my7.remote)" && |
363 | test -z "$(git config branch.my7.merge)"' | |
f1eccbab | 364 | |
f2c8c800 | 365 | test_expect_success 'test deleting branch without config' \ |
5be60078 | 366 | 'git branch my7 s && |
a126ed0a | 367 | sha1=$(git rev-parse my7 | cut -c 1-7) && |
f2c8c800 JH |
368 | echo "Deleted branch my7 (was $sha1)." >expect && |
369 | git branch -d my7 >actual 2>&1 && | |
370 | test_i18ncmp expect actual' | |
f1eccbab | 371 | |
9ed36cfa JS |
372 | test_expect_success 'test --track without .fetch entries' \ |
373 | 'git branch --track my8 && | |
374 | test "$(git config branch.my8.remote)" && | |
375 | test "$(git config branch.my8.merge)"' | |
376 | ||
377 | test_expect_success \ | |
378 | 'branch from non-branch HEAD w/autosetupmerge=always' \ | |
379 | 'git config branch.autosetupmerge always && | |
380 | git branch my9 HEAD^ && | |
381 | git config branch.autosetupmerge false' | |
382 | ||
383 | test_expect_success \ | |
384 | 'branch from non-branch HEAD w/--track causes failure' \ | |
03b9dfb1 | 385 | 'test_must_fail git branch --track my10 HEAD^' |
9ed36cfa | 386 | |
21b5b1e8 JH |
387 | test_expect_success \ |
388 | 'branch from tag w/--track causes failure' \ | |
389 | 'git tag foobar && | |
390 | test_must_fail git branch --track my11 foobar' | |
391 | ||
6183d826 CMN |
392 | test_expect_success 'use --set-upstream-to modify HEAD' \ |
393 | 'test_config branch.master.remote foo && | |
394 | test_config branch.master.merge foo && | |
395 | git branch my12 | |
396 | git branch --set-upstream-to my12 && | |
397 | test "$(git config branch.master.remote)" = "." && | |
398 | test "$(git config branch.master.merge)" = "refs/heads/my12"' | |
399 | ||
400 | test_expect_success 'use --set-upstream-to modify a particular branch' \ | |
401 | 'git branch my13 | |
402 | git branch --set-upstream-to master my13 && | |
403 | test "$(git config branch.my13.remote)" = "." && | |
404 | test "$(git config branch.my13.merge)" = "refs/heads/master"' | |
405 | ||
b84869ef CMN |
406 | test_expect_success '--unset-upstream should fail if given a non-existent branch' \ |
407 | 'test_must_fail git branch --unset-upstream i-dont-exist' | |
408 | ||
409 | test_expect_success 'test --unset-upstream on HEAD' \ | |
410 | 'git branch my14 | |
411 | test_config branch.master.remote foo && | |
412 | test_config branch.master.merge foo && | |
413 | git branch --set-upstream-to my14 && | |
414 | git branch --unset-upstream && | |
415 | test_must_fail git config branch.master.remote && | |
416 | test_must_fail git config branch.master.merge && | |
417 | # fail for a branch without upstream set | |
418 | test_must_fail git branch --unset-upstream | |
419 | ' | |
420 | ||
421 | test_expect_success 'test --unset-upstream on a particular branch' \ | |
422 | 'git branch my15 | |
423 | git branch --set-upstream-to master my14 && | |
424 | git branch --unset-upstream my14 && | |
425 | test_must_fail git config branch.my14.remote && | |
426 | test_must_fail git config branch.my14.merge' | |
427 | ||
b347d06b CMN |
428 | test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' \ |
429 | 'git update-ref refs/remotes/origin/master HEAD && | |
430 | git branch --set-upstream origin/master 2>actual && | |
431 | test_when_finished git update-ref -d refs/remotes/origin/master && | |
432 | test_when_finished git branch -d origin/master && | |
433 | cat >expected <<EOF && | |
434 | The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to | |
435 | ||
436 | If you wanted to make '"'master'"' track '"'origin/master'"', do this: | |
437 | ||
438 | git branch -d origin/master | |
439 | git branch --set-upstream-to origin/master | |
440 | EOF | |
441 | test_cmp expected actual | |
442 | ' | |
443 | ||
444 | test_expect_success '--set-upstream with two args only shows the deprecation message' \ | |
445 | 'git branch --set-upstream master my13 2>actual && | |
446 | test_when_finished git branch --unset-upstream master && | |
447 | cat >expected <<EOF && | |
448 | The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to | |
449 | EOF | |
450 | test_cmp expected actual | |
451 | ' | |
452 | ||
453 | test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' \ | |
454 | 'git branch --set-upstream my13 2>actual && | |
455 | test_when_finished git branch --unset-upstream my13 && | |
456 | cat >expected <<EOF && | |
457 | The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to | |
458 | EOF | |
459 | test_cmp expected actual | |
460 | ' | |
461 | ||
0746d19a PB |
462 | # Keep this test last, as it changes the current branch |
463 | cat >expect <<EOF | |
3749fde5 | 464 | $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master |
0746d19a PB |
465 | EOF |
466 | test_expect_success \ | |
467 | 'git checkout -b g/h/i -l should create a branch and a log' \ | |
468 | 'GIT_COMMITTER_DATE="2005-05-26 23:30" \ | |
0cb0e143 | 469 | git checkout -b g/h/i -l master && |
376eb14a JK |
470 | test_path_is_file .git/refs/heads/g/h/i && |
471 | test_path_is_file .git/logs/refs/heads/g/h/i && | |
4fdf71be | 472 | test_cmp expect .git/logs/refs/heads/g/h/i' |
0746d19a | 473 | |
b2099957 EM |
474 | test_expect_success 'checkout -b makes reflog by default' ' |
475 | git checkout master && | |
476 | git config --unset core.logAllRefUpdates && | |
477 | git checkout -b alpha && | |
6e6842e3 | 478 | git rev-parse --verify alpha@{0} |
b2099957 EM |
479 | ' |
480 | ||
481 | test_expect_success 'checkout -b does not make reflog when core.logAllRefUpdates = false' ' | |
482 | git checkout master && | |
483 | git config core.logAllRefUpdates false && | |
484 | git checkout -b beta && | |
6e6842e3 | 485 | test_must_fail git rev-parse --verify beta@{0} |
b2099957 EM |
486 | ' |
487 | ||
488 | test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' ' | |
489 | git checkout master && | |
490 | git checkout -lb gamma && | |
491 | git config --unset core.logAllRefUpdates && | |
6e6842e3 | 492 | git rev-parse --verify gamma@{0} |
b2099957 EM |
493 | ' |
494 | ||
1d0a694b DB |
495 | test_expect_success 'avoid ambiguous track' ' |
496 | git config branch.autosetupmerge true && | |
497 | git config remote.ambi1.url lalala && | |
498 | git config remote.ambi1.fetch refs/heads/lalala:refs/heads/master && | |
499 | git config remote.ambi2.url lilili && | |
500 | git config remote.ambi2.fetch refs/heads/lilili:refs/heads/master && | |
501 | git branch all1 master && | |
502 | test -z "$(git config branch.all1.merge)" | |
503 | ' | |
504 | ||
c998ae9b DS |
505 | test_expect_success 'autosetuprebase local on a tracked local branch' ' |
506 | git config remote.local.url . && | |
507 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
508 | git config branch.autosetuprebase local && | |
0cb0e143 | 509 | (git show-ref -q refs/remotes/local/o || git fetch local) && |
c998ae9b DS |
510 | git branch mybase && |
511 | git branch --track myr1 mybase && | |
512 | test "$(git config branch.myr1.remote)" = . && | |
513 | test "$(git config branch.myr1.merge)" = refs/heads/mybase && | |
514 | test "$(git config branch.myr1.rebase)" = true | |
515 | ' | |
516 | ||
517 | test_expect_success 'autosetuprebase always on a tracked local branch' ' | |
518 | git config remote.local.url . && | |
519 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
520 | git config branch.autosetuprebase always && | |
0cb0e143 | 521 | (git show-ref -q refs/remotes/local/o || git fetch local) && |
c998ae9b DS |
522 | git branch mybase2 && |
523 | git branch --track myr2 mybase && | |
524 | test "$(git config branch.myr2.remote)" = . && | |
525 | test "$(git config branch.myr2.merge)" = refs/heads/mybase && | |
526 | test "$(git config branch.myr2.rebase)" = true | |
527 | ' | |
528 | ||
529 | test_expect_success 'autosetuprebase remote on a tracked local branch' ' | |
530 | git config remote.local.url . && | |
531 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
532 | git config branch.autosetuprebase remote && | |
0cb0e143 | 533 | (git show-ref -q refs/remotes/local/o || git fetch local) && |
c998ae9b DS |
534 | git branch mybase3 && |
535 | git branch --track myr3 mybase2 && | |
536 | test "$(git config branch.myr3.remote)" = . && | |
537 | test "$(git config branch.myr3.merge)" = refs/heads/mybase2 && | |
538 | ! test "$(git config branch.myr3.rebase)" = true | |
539 | ' | |
540 | ||
541 | test_expect_success 'autosetuprebase never on a tracked local branch' ' | |
542 | git config remote.local.url . && | |
543 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
544 | git config branch.autosetuprebase never && | |
0cb0e143 | 545 | (git show-ref -q refs/remotes/local/o || git fetch local) && |
c998ae9b DS |
546 | git branch mybase4 && |
547 | git branch --track myr4 mybase2 && | |
548 | test "$(git config branch.myr4.remote)" = . && | |
549 | test "$(git config branch.myr4.merge)" = refs/heads/mybase2 && | |
550 | ! test "$(git config branch.myr4.rebase)" = true | |
551 | ' | |
552 | ||
553 | test_expect_success 'autosetuprebase local on a tracked remote branch' ' | |
554 | git config remote.local.url . && | |
555 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
556 | git config branch.autosetuprebase local && | |
0cb0e143 | 557 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
558 | git branch --track myr5 local/master && |
559 | test "$(git config branch.myr5.remote)" = local && | |
560 | test "$(git config branch.myr5.merge)" = refs/heads/master && | |
561 | ! test "$(git config branch.myr5.rebase)" = true | |
562 | ' | |
563 | ||
564 | test_expect_success 'autosetuprebase never on a tracked remote branch' ' | |
565 | git config remote.local.url . && | |
566 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
567 | git config branch.autosetuprebase never && | |
0cb0e143 | 568 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
569 | git branch --track myr6 local/master && |
570 | test "$(git config branch.myr6.remote)" = local && | |
571 | test "$(git config branch.myr6.merge)" = refs/heads/master && | |
572 | ! test "$(git config branch.myr6.rebase)" = true | |
573 | ' | |
574 | ||
575 | test_expect_success 'autosetuprebase remote on a tracked remote branch' ' | |
576 | git config remote.local.url . && | |
577 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
578 | git config branch.autosetuprebase remote && | |
0cb0e143 | 579 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
580 | git branch --track myr7 local/master && |
581 | test "$(git config branch.myr7.remote)" = local && | |
582 | test "$(git config branch.myr7.merge)" = refs/heads/master && | |
583 | test "$(git config branch.myr7.rebase)" = true | |
584 | ' | |
585 | ||
586 | test_expect_success 'autosetuprebase always on a tracked remote branch' ' | |
587 | git config remote.local.url . && | |
588 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
589 | git config branch.autosetuprebase remote && | |
0cb0e143 | 590 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
591 | git branch --track myr8 local/master && |
592 | test "$(git config branch.myr8.remote)" = local && | |
593 | test "$(git config branch.myr8.merge)" = refs/heads/master && | |
594 | test "$(git config branch.myr8.rebase)" = true | |
595 | ' | |
596 | ||
597 | test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' ' | |
598 | git config --unset branch.autosetuprebase && | |
599 | git config remote.local.url . && | |
600 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 601 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
602 | git branch --track myr9 local/master && |
603 | test "$(git config branch.myr9.remote)" = local && | |
604 | test "$(git config branch.myr9.merge)" = refs/heads/master && | |
605 | test "z$(git config branch.myr9.rebase)" = z | |
606 | ' | |
607 | ||
608 | test_expect_success 'autosetuprebase unconfigured on a tracked local branch' ' | |
609 | git config remote.local.url . && | |
610 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 611 | (git show-ref -q refs/remotes/local/o || git fetch local) && |
c998ae9b DS |
612 | git branch mybase10 && |
613 | git branch --track myr10 mybase2 && | |
614 | test "$(git config branch.myr10.remote)" = . && | |
615 | test "$(git config branch.myr10.merge)" = refs/heads/mybase2 && | |
616 | test "z$(git config branch.myr10.rebase)" = z | |
617 | ' | |
618 | ||
619 | test_expect_success 'autosetuprebase unconfigured on untracked local branch' ' | |
620 | git config remote.local.url . && | |
621 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 622 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
623 | git branch --no-track myr11 mybase2 && |
624 | test "z$(git config branch.myr11.remote)" = z && | |
625 | test "z$(git config branch.myr11.merge)" = z && | |
626 | test "z$(git config branch.myr11.rebase)" = z | |
627 | ' | |
628 | ||
629 | test_expect_success 'autosetuprebase unconfigured on untracked remote branch' ' | |
630 | git config remote.local.url . && | |
631 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 632 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
633 | git branch --no-track myr12 local/master && |
634 | test "z$(git config branch.myr12.remote)" = z && | |
635 | test "z$(git config branch.myr12.merge)" = z && | |
636 | test "z$(git config branch.myr12.rebase)" = z | |
637 | ' | |
638 | ||
639 | test_expect_success 'autosetuprebase never on an untracked local branch' ' | |
640 | git config branch.autosetuprebase never && | |
641 | git config remote.local.url . && | |
642 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 643 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
644 | git branch --no-track myr13 mybase2 && |
645 | test "z$(git config branch.myr13.remote)" = z && | |
646 | test "z$(git config branch.myr13.merge)" = z && | |
647 | test "z$(git config branch.myr13.rebase)" = z | |
648 | ' | |
649 | ||
650 | test_expect_success 'autosetuprebase local on an untracked local branch' ' | |
651 | git config branch.autosetuprebase local && | |
652 | git config remote.local.url . && | |
653 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 654 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
655 | git branch --no-track myr14 mybase2 && |
656 | test "z$(git config branch.myr14.remote)" = z && | |
657 | test "z$(git config branch.myr14.merge)" = z && | |
658 | test "z$(git config branch.myr14.rebase)" = z | |
659 | ' | |
660 | ||
661 | test_expect_success 'autosetuprebase remote on an untracked local branch' ' | |
662 | git config branch.autosetuprebase remote && | |
663 | git config remote.local.url . && | |
664 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 665 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
666 | git branch --no-track myr15 mybase2 && |
667 | test "z$(git config branch.myr15.remote)" = z && | |
668 | test "z$(git config branch.myr15.merge)" = z && | |
669 | test "z$(git config branch.myr15.rebase)" = z | |
670 | ' | |
671 | ||
672 | test_expect_success 'autosetuprebase always on an untracked local branch' ' | |
673 | git config branch.autosetuprebase always && | |
674 | git config remote.local.url . && | |
675 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 676 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
677 | git branch --no-track myr16 mybase2 && |
678 | test "z$(git config branch.myr16.remote)" = z && | |
679 | test "z$(git config branch.myr16.merge)" = z && | |
680 | test "z$(git config branch.myr16.rebase)" = z | |
681 | ' | |
682 | ||
683 | test_expect_success 'autosetuprebase never on an untracked remote branch' ' | |
684 | git config branch.autosetuprebase never && | |
685 | git config remote.local.url . && | |
686 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 687 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
688 | git branch --no-track myr17 local/master && |
689 | test "z$(git config branch.myr17.remote)" = z && | |
690 | test "z$(git config branch.myr17.merge)" = z && | |
691 | test "z$(git config branch.myr17.rebase)" = z | |
692 | ' | |
693 | ||
694 | test_expect_success 'autosetuprebase local on an untracked remote branch' ' | |
695 | git config branch.autosetuprebase local && | |
696 | git config remote.local.url . && | |
697 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 698 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
699 | git branch --no-track myr18 local/master && |
700 | test "z$(git config branch.myr18.remote)" = z && | |
701 | test "z$(git config branch.myr18.merge)" = z && | |
702 | test "z$(git config branch.myr18.rebase)" = z | |
703 | ' | |
704 | ||
705 | test_expect_success 'autosetuprebase remote on an untracked remote branch' ' | |
706 | git config branch.autosetuprebase remote && | |
707 | git config remote.local.url . && | |
708 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 709 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
710 | git branch --no-track myr19 local/master && |
711 | test "z$(git config branch.myr19.remote)" = z && | |
712 | test "z$(git config branch.myr19.merge)" = z && | |
713 | test "z$(git config branch.myr19.rebase)" = z | |
714 | ' | |
715 | ||
716 | test_expect_success 'autosetuprebase always on an untracked remote branch' ' | |
717 | git config branch.autosetuprebase always && | |
718 | git config remote.local.url . && | |
719 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
0cb0e143 | 720 | (git show-ref -q refs/remotes/local/master || git fetch local) && |
c998ae9b DS |
721 | git branch --no-track myr20 local/master && |
722 | test "z$(git config branch.myr20.remote)" = z && | |
723 | test "z$(git config branch.myr20.merge)" = z && | |
724 | test "z$(git config branch.myr20.rebase)" = z | |
725 | ' | |
726 | ||
21b5b1e8 JH |
727 | test_expect_success 'autosetuprebase always on detached HEAD' ' |
728 | git config branch.autosetupmerge always && | |
729 | test_when_finished git checkout master && | |
730 | git checkout HEAD^0 && | |
731 | git branch my11 && | |
732 | test -z "$(git config branch.my11.remote)" && | |
733 | test -z "$(git config branch.my11.merge)" | |
734 | ' | |
735 | ||
c998ae9b DS |
736 | test_expect_success 'detect misconfigured autosetuprebase (bad value)' ' |
737 | git config branch.autosetuprebase garbage && | |
738 | test_must_fail git branch | |
739 | ' | |
740 | ||
741 | test_expect_success 'detect misconfigured autosetuprebase (no value)' ' | |
742 | git config --unset branch.autosetuprebase && | |
743 | echo "[branch] autosetuprebase" >> .git/config && | |
744 | test_must_fail git branch && | |
745 | git config --unset branch.autosetuprebase | |
746 | ' | |
747 | ||
99c419c9 JH |
748 | test_expect_success 'attempt to delete a branch without base and unmerged to HEAD' ' |
749 | git checkout my9 && | |
750 | git config --unset branch.my8.merge && | |
751 | test_must_fail git branch -d my8 | |
752 | ' | |
753 | ||
754 | test_expect_success 'attempt to delete a branch merged to its base' ' | |
755 | # we are on my9 which is the initial commit; traditionally | |
756 | # we would not have allowed deleting my8 that is not merged | |
757 | # to my9, but it is set to track master that already has my8 | |
758 | git config branch.my8.merge refs/heads/master && | |
759 | git branch -d my8 | |
760 | ' | |
761 | ||
762 | test_expect_success 'attempt to delete a branch merged to its base' ' | |
763 | git checkout master && | |
764 | echo Third >>A && | |
765 | git commit -m "Third commit" A && | |
766 | git branch -t my10 my9 && | |
767 | git branch -f my10 HEAD^ && | |
768 | # we are on master which is at the third commit, and my10 | |
769 | # is behind us, so traditionally we would have allowed deleting | |
770 | # it; but my10 is set to track my9 that is further behind. | |
771 | test_must_fail git branch -d my10 | |
772 | ' | |
773 | ||
fa799376 JH |
774 | test_expect_success 'use set-upstream on the current branch' ' |
775 | git checkout master && | |
776 | git --bare init myupstream.git && | |
777 | git push myupstream.git master:refs/heads/frotz && | |
778 | git remote add origin myupstream.git && | |
779 | git fetch && | |
780 | git branch --set-upstream master origin/frotz && | |
781 | ||
782 | test "z$(git config branch.master.remote)" = "zorigin" && | |
783 | test "z$(git config branch.master.merge)" = "zrefs/heads/frotz" | |
784 | ||
785 | ' | |
786 | ||
c2d17ba3 JH |
787 | test_expect_success 'use --edit-description' ' |
788 | write_script editor <<-\EOF && | |
789 | echo "New contents" >"$1" | |
790 | EOF | |
791 | EDITOR=./editor git branch --edit-description && | |
792 | write_script editor <<-\EOF && | |
793 | git stripspace -s <"$1" >"EDITOR_OUTPUT" | |
794 | EOF | |
795 | EDITOR=./editor git branch --edit-description && | |
796 | echo "New contents" >expect && | |
797 | test_cmp EDITOR_OUTPUT expect | |
798 | ' | |
799 | ||
800 | test_expect_success 'detect typo in branch name when using --edit-description' ' | |
801 | write_script editor <<-\EOF && | |
802 | echo "New contents" >"$1" | |
803 | EOF | |
804 | ( | |
805 | EDITOR=./editor && | |
806 | export EDITOR && | |
807 | test_must_fail git branch --edit-description no-such-branch | |
808 | ) | |
809 | ' | |
810 | ||
811 | test_expect_success 'refuse --edit-description on unborn branch for now' ' | |
812 | write_script editor <<-\EOF && | |
813 | echo "New contents" >"$1" | |
814 | EOF | |
815 | git checkout --orphan unborn && | |
816 | ( | |
817 | EDITOR=./editor && | |
818 | export EDITOR && | |
819 | test_must_fail git branch --edit-description | |
820 | ) | |
821 | ' | |
822 | ||
6c41e975 CMN |
823 | test_expect_success '--merged catches invalid object names' ' |
824 | test_must_fail git branch --merged 0000000000000000000000000000000000000000 | |
825 | ' | |
826 | ||
a3b427b9 | 827 | test_done |