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