t4150: am --resolved fails if index has no changes
[git/mingw/j6t.git] / t / t3200-branch.sh
blobddea49808d063f6c169cf8078f5698e34c2ba803
1 #!/bin/sh
3 # Copyright (c) 2005 Amos Waterland
6 test_description='git branch assorted tests'
8 . ./test-lib.sh
10 test_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)
20 test_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
25 test_expect_success 'branch -h in broken repository' '
26 mkdir broken &&
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
36 test_expect_success 'git branch abc should create a branch' '
37 git branch abc && test_path_is_file .git/refs/heads/abc
40 test_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
44 test_expect_success 'git branch HEAD should fail' '
45 test_must_fail git branch HEAD
48 cat >expect <<EOF
49 $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
50 EOF
51 test_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
59 test_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_path_is_missing .git/logs/refs/heads/d/e/f
65 test_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
71 test_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
77 test_expect_success 'git branch -m dumps usage' '
78 test_expect_code 128 git branch -m 2>err &&
79 test_i18ngrep "branch name required" err
82 test_expect_success 'git branch -m m m/m should work' '
83 git branch -l m &&
84 git branch -m m m/m &&
85 test_path_is_file .git/logs/refs/heads/m/m
88 test_expect_success 'git branch -m n/n n should work' '
89 git branch -l n/n &&
90 git branch -m n/n n &&
91 test_path_is_file .git/logs/refs/heads/n
94 test_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
100 test_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
105 test_expect_success 'git branch -M o/q o/p should work when o/p exists' '
106 git branch -M o/q o/p
109 test_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
114 test_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
120 test_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
126 test_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
132 test_expect_success 'git branch -M master should work when master is checked out' '
133 git checkout master &&
134 git branch -M master
137 test_expect_success 'git branch -M master master should work when master is checked out' '
138 git checkout master &&
139 git branch -M master master
142 test_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
148 test_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
155 test_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
164 test_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
172 test_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
180 test_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
186 test_cmp expected actual
189 test_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
204 * master
205 master2
211 $long
213 test_cmp expected actual
216 test_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
226 test_cmp expected actual
229 test_expect_success 'git branch --column -v should fail' '
230 test_must_fail git branch --column -v
233 test_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
246 * master
247 master2
254 test_cmp expected actual
257 mv .git/config .git/config-saved
259 test_expect_success 'git branch -m q q2 without config should succeed' '
260 git branch -m q q2 &&
261 git branch -m q2 q
264 mv .git/config-saved .git/config
266 git config branch.s/s.dummy Hello
268 test_expect_success 'git branch -m s/s s should work when s/t is deleted' '
269 git branch -l s/s &&
270 test_path_is_file .git/logs/refs/heads/s/s &&
271 git branch -l s/t &&
272 test_path_is_file .git/logs/refs/heads/s/t &&
273 git branch -d s/t &&
274 git branch -m s/s s &&
275 test_path_is_file .git/logs/refs/heads/s
278 test_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
283 test_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
293 test_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
302 test_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
311 test_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
319 test_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
326 test_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
335 test_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
344 test_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
354 test_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
364 test_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
375 test_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)"
383 test_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
392 test_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)"
398 test_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
406 test_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)"
412 test_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
418 test_expect_success 'branch from non-branch HEAD w/--track causes failure' '
419 test_must_fail git branch --track my10 HEAD^
422 test_expect_success 'branch from tag w/--track causes failure' '
423 git tag foobar &&
424 test_must_fail git branch --track my11 foobar
427 test_expect_success '--set-upstream-to fails on multiple branches' '
428 test_must_fail git branch --set-upstream-to master a b c
431 test_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 -
437 test_expect_success '--set-upstream-to fails on a missing dst branch' '
438 test_must_fail git branch --set-upstream-to master does-not-exist
441 test_expect_success '--set-upstream-to fails on a missing src branch' '
442 test_must_fail git branch --set-upstream-to does-not-exist master
445 test_expect_success '--set-upstream-to fails on a non-ref' '
446 test_must_fail git branch --set-upstream-to HEAD^{}
449 test_expect_success 'use --set-upstream-to modify HEAD' '
450 test_config branch.master.remote foo &&
451 test_config branch.master.merge foo &&
452 git branch my12 &&
453 git branch --set-upstream-to my12 &&
454 test "$(git config branch.master.remote)" = "." &&
455 test "$(git config branch.master.merge)" = "refs/heads/my12"
458 test_expect_success 'use --set-upstream-to modify a particular branch' '
459 git branch my13 &&
460 git branch --set-upstream-to master my13 &&
461 test "$(git config branch.my13.remote)" = "." &&
462 test "$(git config branch.my13.merge)" = "refs/heads/master"
465 test_expect_success '--unset-upstream should fail if given a non-existent branch' '
466 test_must_fail git branch --unset-upstream i-dont-exist
469 test_expect_success 'test --unset-upstream on HEAD' '
470 git branch my14 &&
471 test_config branch.master.remote foo &&
472 test_config branch.master.merge foo &&
473 git branch --set-upstream-to my14 &&
474 git branch --unset-upstream &&
475 test_must_fail git config branch.master.remote &&
476 test_must_fail git config branch.master.merge &&
477 # fail for a branch without upstream set
478 test_must_fail git branch --unset-upstream
481 test_expect_success '--unset-upstream should fail on multiple branches' '
482 test_must_fail git branch --unset-upstream a b c
485 test_expect_success '--unset-upstream should fail on detached HEAD' '
486 git checkout HEAD^{} &&
487 test_must_fail git branch --unset-upstream &&
488 git checkout -
491 test_expect_success 'test --unset-upstream on a particular branch' '
492 git branch my15 &&
493 git branch --set-upstream-to master my14 &&
494 git branch --unset-upstream my14 &&
495 test_must_fail git config branch.my14.remote &&
496 test_must_fail git config branch.my14.merge
499 test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' '
500 git update-ref refs/remotes/origin/master HEAD &&
501 git branch --set-upstream origin/master 2>actual &&
502 test_when_finished git update-ref -d refs/remotes/origin/master &&
503 test_when_finished git branch -d origin/master &&
504 cat >expected <<EOF &&
505 The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
507 If you wanted to make '"'master'"' track '"'origin/master'"', do this:
509 git branch -d origin/master
510 git branch --set-upstream-to origin/master
512 test_cmp expected actual
515 test_expect_success '--set-upstream with two args only shows the deprecation message' '
516 git branch --set-upstream master my13 2>actual &&
517 test_when_finished git branch --unset-upstream master &&
518 cat >expected <<EOF &&
519 The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
521 test_cmp expected actual
524 test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' '
525 git branch --set-upstream my13 2>actual &&
526 test_when_finished git branch --unset-upstream my13 &&
527 cat >expected <<EOF &&
528 The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
530 test_cmp expected actual
533 test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
534 git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
535 cat >expected <<-\EOF &&
536 warning: Not setting branch my13 as its own upstream.
538 test_expect_code 1 git config branch.my13.remote &&
539 test_expect_code 1 git config branch.my13.merge &&
540 test_i18ncmp expected actual
543 # Keep this test last, as it changes the current branch
544 cat >expect <<EOF
545 $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
547 test_expect_success 'git checkout -b g/h/i -l should create a branch and a log' '
548 GIT_COMMITTER_DATE="2005-05-26 23:30" \
549 git checkout -b g/h/i -l master &&
550 test_path_is_file .git/refs/heads/g/h/i &&
551 test_path_is_file .git/logs/refs/heads/g/h/i &&
552 test_cmp expect .git/logs/refs/heads/g/h/i
555 test_expect_success 'checkout -b makes reflog by default' '
556 git checkout master &&
557 git config --unset core.logAllRefUpdates &&
558 git checkout -b alpha &&
559 git rev-parse --verify alpha@{0}
562 test_expect_success 'checkout -b does not make reflog when core.logAllRefUpdates = false' '
563 git checkout master &&
564 git config core.logAllRefUpdates false &&
565 git checkout -b beta &&
566 test_must_fail git rev-parse --verify beta@{0}
569 test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' '
570 git checkout master &&
571 git checkout -lb gamma &&
572 git config --unset core.logAllRefUpdates &&
573 git rev-parse --verify gamma@{0}
576 test_expect_success 'avoid ambiguous track' '
577 git config branch.autosetupmerge true &&
578 git config remote.ambi1.url lalala &&
579 git config remote.ambi1.fetch refs/heads/lalala:refs/heads/master &&
580 git config remote.ambi2.url lilili &&
581 git config remote.ambi2.fetch refs/heads/lilili:refs/heads/master &&
582 git branch all1 master &&
583 test -z "$(git config branch.all1.merge)"
586 test_expect_success 'autosetuprebase local on a tracked local branch' '
587 git config remote.local.url . &&
588 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
589 git config branch.autosetuprebase local &&
590 (git show-ref -q refs/remotes/local/o || git fetch local) &&
591 git branch mybase &&
592 git branch --track myr1 mybase &&
593 test "$(git config branch.myr1.remote)" = . &&
594 test "$(git config branch.myr1.merge)" = refs/heads/mybase &&
595 test "$(git config branch.myr1.rebase)" = true
598 test_expect_success 'autosetuprebase always on a tracked local branch' '
599 git config remote.local.url . &&
600 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
601 git config branch.autosetuprebase always &&
602 (git show-ref -q refs/remotes/local/o || git fetch local) &&
603 git branch mybase2 &&
604 git branch --track myr2 mybase &&
605 test "$(git config branch.myr2.remote)" = . &&
606 test "$(git config branch.myr2.merge)" = refs/heads/mybase &&
607 test "$(git config branch.myr2.rebase)" = true
610 test_expect_success 'autosetuprebase remote on a tracked local branch' '
611 git config remote.local.url . &&
612 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
613 git config branch.autosetuprebase remote &&
614 (git show-ref -q refs/remotes/local/o || git fetch local) &&
615 git branch mybase3 &&
616 git branch --track myr3 mybase2 &&
617 test "$(git config branch.myr3.remote)" = . &&
618 test "$(git config branch.myr3.merge)" = refs/heads/mybase2 &&
619 ! test "$(git config branch.myr3.rebase)" = true
622 test_expect_success 'autosetuprebase never on a tracked local branch' '
623 git config remote.local.url . &&
624 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
625 git config branch.autosetuprebase never &&
626 (git show-ref -q refs/remotes/local/o || git fetch local) &&
627 git branch mybase4 &&
628 git branch --track myr4 mybase2 &&
629 test "$(git config branch.myr4.remote)" = . &&
630 test "$(git config branch.myr4.merge)" = refs/heads/mybase2 &&
631 ! test "$(git config branch.myr4.rebase)" = true
634 test_expect_success 'autosetuprebase local on a tracked remote branch' '
635 git config remote.local.url . &&
636 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
637 git config branch.autosetuprebase local &&
638 (git show-ref -q refs/remotes/local/master || git fetch local) &&
639 git branch --track myr5 local/master &&
640 test "$(git config branch.myr5.remote)" = local &&
641 test "$(git config branch.myr5.merge)" = refs/heads/master &&
642 ! test "$(git config branch.myr5.rebase)" = true
645 test_expect_success 'autosetuprebase never on a tracked remote branch' '
646 git config remote.local.url . &&
647 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
648 git config branch.autosetuprebase never &&
649 (git show-ref -q refs/remotes/local/master || git fetch local) &&
650 git branch --track myr6 local/master &&
651 test "$(git config branch.myr6.remote)" = local &&
652 test "$(git config branch.myr6.merge)" = refs/heads/master &&
653 ! test "$(git config branch.myr6.rebase)" = true
656 test_expect_success 'autosetuprebase remote on a tracked remote branch' '
657 git config remote.local.url . &&
658 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
659 git config branch.autosetuprebase remote &&
660 (git show-ref -q refs/remotes/local/master || git fetch local) &&
661 git branch --track myr7 local/master &&
662 test "$(git config branch.myr7.remote)" = local &&
663 test "$(git config branch.myr7.merge)" = refs/heads/master &&
664 test "$(git config branch.myr7.rebase)" = true
667 test_expect_success 'autosetuprebase always on a tracked remote branch' '
668 git config remote.local.url . &&
669 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
670 git config branch.autosetuprebase remote &&
671 (git show-ref -q refs/remotes/local/master || git fetch local) &&
672 git branch --track myr8 local/master &&
673 test "$(git config branch.myr8.remote)" = local &&
674 test "$(git config branch.myr8.merge)" = refs/heads/master &&
675 test "$(git config branch.myr8.rebase)" = true
678 test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' '
679 git config --unset branch.autosetuprebase &&
680 git config remote.local.url . &&
681 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
682 (git show-ref -q refs/remotes/local/master || git fetch local) &&
683 git branch --track myr9 local/master &&
684 test "$(git config branch.myr9.remote)" = local &&
685 test "$(git config branch.myr9.merge)" = refs/heads/master &&
686 test "z$(git config branch.myr9.rebase)" = z
689 test_expect_success 'autosetuprebase unconfigured on a tracked local branch' '
690 git config remote.local.url . &&
691 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
692 (git show-ref -q refs/remotes/local/o || git fetch local) &&
693 git branch mybase10 &&
694 git branch --track myr10 mybase2 &&
695 test "$(git config branch.myr10.remote)" = . &&
696 test "$(git config branch.myr10.merge)" = refs/heads/mybase2 &&
697 test "z$(git config branch.myr10.rebase)" = z
700 test_expect_success 'autosetuprebase unconfigured on untracked local branch' '
701 git config remote.local.url . &&
702 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
703 (git show-ref -q refs/remotes/local/master || git fetch local) &&
704 git branch --no-track myr11 mybase2 &&
705 test "z$(git config branch.myr11.remote)" = z &&
706 test "z$(git config branch.myr11.merge)" = z &&
707 test "z$(git config branch.myr11.rebase)" = z
710 test_expect_success 'autosetuprebase unconfigured on untracked remote branch' '
711 git config remote.local.url . &&
712 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
713 (git show-ref -q refs/remotes/local/master || git fetch local) &&
714 git branch --no-track myr12 local/master &&
715 test "z$(git config branch.myr12.remote)" = z &&
716 test "z$(git config branch.myr12.merge)" = z &&
717 test "z$(git config branch.myr12.rebase)" = z
720 test_expect_success 'autosetuprebase never on an untracked local branch' '
721 git config branch.autosetuprebase never &&
722 git config remote.local.url . &&
723 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
724 (git show-ref -q refs/remotes/local/master || git fetch local) &&
725 git branch --no-track myr13 mybase2 &&
726 test "z$(git config branch.myr13.remote)" = z &&
727 test "z$(git config branch.myr13.merge)" = z &&
728 test "z$(git config branch.myr13.rebase)" = z
731 test_expect_success 'autosetuprebase local on an untracked local branch' '
732 git config branch.autosetuprebase local &&
733 git config remote.local.url . &&
734 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
735 (git show-ref -q refs/remotes/local/master || git fetch local) &&
736 git branch --no-track myr14 mybase2 &&
737 test "z$(git config branch.myr14.remote)" = z &&
738 test "z$(git config branch.myr14.merge)" = z &&
739 test "z$(git config branch.myr14.rebase)" = z
742 test_expect_success 'autosetuprebase remote on an untracked local branch' '
743 git config branch.autosetuprebase remote &&
744 git config remote.local.url . &&
745 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
746 (git show-ref -q refs/remotes/local/master || git fetch local) &&
747 git branch --no-track myr15 mybase2 &&
748 test "z$(git config branch.myr15.remote)" = z &&
749 test "z$(git config branch.myr15.merge)" = z &&
750 test "z$(git config branch.myr15.rebase)" = z
753 test_expect_success 'autosetuprebase always on an untracked local branch' '
754 git config branch.autosetuprebase always &&
755 git config remote.local.url . &&
756 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
757 (git show-ref -q refs/remotes/local/master || git fetch local) &&
758 git branch --no-track myr16 mybase2 &&
759 test "z$(git config branch.myr16.remote)" = z &&
760 test "z$(git config branch.myr16.merge)" = z &&
761 test "z$(git config branch.myr16.rebase)" = z
764 test_expect_success 'autosetuprebase never on an untracked remote branch' '
765 git config branch.autosetuprebase never &&
766 git config remote.local.url . &&
767 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
768 (git show-ref -q refs/remotes/local/master || git fetch local) &&
769 git branch --no-track myr17 local/master &&
770 test "z$(git config branch.myr17.remote)" = z &&
771 test "z$(git config branch.myr17.merge)" = z &&
772 test "z$(git config branch.myr17.rebase)" = z
775 test_expect_success 'autosetuprebase local on an untracked remote branch' '
776 git config branch.autosetuprebase local &&
777 git config remote.local.url . &&
778 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
779 (git show-ref -q refs/remotes/local/master || git fetch local) &&
780 git branch --no-track myr18 local/master &&
781 test "z$(git config branch.myr18.remote)" = z &&
782 test "z$(git config branch.myr18.merge)" = z &&
783 test "z$(git config branch.myr18.rebase)" = z
786 test_expect_success 'autosetuprebase remote on an untracked remote branch' '
787 git config branch.autosetuprebase remote &&
788 git config remote.local.url . &&
789 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
790 (git show-ref -q refs/remotes/local/master || git fetch local) &&
791 git branch --no-track myr19 local/master &&
792 test "z$(git config branch.myr19.remote)" = z &&
793 test "z$(git config branch.myr19.merge)" = z &&
794 test "z$(git config branch.myr19.rebase)" = z
797 test_expect_success 'autosetuprebase always on an untracked remote branch' '
798 git config branch.autosetuprebase always &&
799 git config remote.local.url . &&
800 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
801 (git show-ref -q refs/remotes/local/master || git fetch local) &&
802 git branch --no-track myr20 local/master &&
803 test "z$(git config branch.myr20.remote)" = z &&
804 test "z$(git config branch.myr20.merge)" = z &&
805 test "z$(git config branch.myr20.rebase)" = z
808 test_expect_success 'autosetuprebase always on detached HEAD' '
809 git config branch.autosetupmerge always &&
810 test_when_finished git checkout master &&
811 git checkout HEAD^0 &&
812 git branch my11 &&
813 test -z "$(git config branch.my11.remote)" &&
814 test -z "$(git config branch.my11.merge)"
817 test_expect_success 'detect misconfigured autosetuprebase (bad value)' '
818 git config branch.autosetuprebase garbage &&
819 test_must_fail git branch
822 test_expect_success 'detect misconfigured autosetuprebase (no value)' '
823 git config --unset branch.autosetuprebase &&
824 echo "[branch] autosetuprebase" >>.git/config &&
825 test_must_fail git branch &&
826 git config --unset branch.autosetuprebase
829 test_expect_success 'attempt to delete a branch without base and unmerged to HEAD' '
830 git checkout my9 &&
831 git config --unset branch.my8.merge &&
832 test_must_fail git branch -d my8
835 test_expect_success 'attempt to delete a branch merged to its base' '
836 # we are on my9 which is the initial commit; traditionally
837 # we would not have allowed deleting my8 that is not merged
838 # to my9, but it is set to track master that already has my8
839 git config branch.my8.merge refs/heads/master &&
840 git branch -d my8
843 test_expect_success 'attempt to delete a branch merged to its base' '
844 git checkout master &&
845 echo Third >>A &&
846 git commit -m "Third commit" A &&
847 git branch -t my10 my9 &&
848 git branch -f my10 HEAD^ &&
849 # we are on master which is at the third commit, and my10
850 # is behind us, so traditionally we would have allowed deleting
851 # it; but my10 is set to track my9 that is further behind.
852 test_must_fail git branch -d my10
855 test_expect_success 'use set-upstream on the current branch' '
856 git checkout master &&
857 git --bare init myupstream.git &&
858 git push myupstream.git master:refs/heads/frotz &&
859 git remote add origin myupstream.git &&
860 git fetch &&
861 git branch --set-upstream master origin/frotz &&
863 test "z$(git config branch.master.remote)" = "zorigin" &&
864 test "z$(git config branch.master.merge)" = "zrefs/heads/frotz"
868 test_expect_success 'use --edit-description' '
869 write_script editor <<-\EOF &&
870 echo "New contents" >"$1"
872 EDITOR=./editor git branch --edit-description &&
873 write_script editor <<-\EOF &&
874 git stripspace -s <"$1" >"EDITOR_OUTPUT"
876 EDITOR=./editor git branch --edit-description &&
877 echo "New contents" >expect &&
878 test_cmp EDITOR_OUTPUT expect
881 test_expect_success 'detect typo in branch name when using --edit-description' '
882 write_script editor <<-\EOF &&
883 echo "New contents" >"$1"
885 test_must_fail env EDITOR=./editor git branch --edit-description no-such-branch
888 test_expect_success 'refuse --edit-description on unborn branch for now' '
889 write_script editor <<-\EOF &&
890 echo "New contents" >"$1"
892 git checkout --orphan unborn &&
893 test_must_fail env EDITOR=./editor git branch --edit-description
896 test_expect_success '--merged catches invalid object names' '
897 test_must_fail git branch --merged 0000000000000000000000000000000000000000
900 test_expect_success 'tracking with unexpected .fetch refspec' '
901 rm -rf a b c d &&
902 git init a &&
904 cd a &&
905 test_commit a
906 ) &&
907 git init b &&
909 cd b &&
910 test_commit b
911 ) &&
912 git init c &&
914 cd c &&
915 test_commit c &&
916 git remote add a ../a &&
917 git remote add b ../b &&
918 git fetch --all
919 ) &&
920 git init d &&
922 cd d &&
923 git remote add c ../c &&
924 git config remote.c.fetch "+refs/remotes/*:refs/remotes/*" &&
925 git fetch c &&
926 git branch --track local/a/master remotes/a/master &&
927 test "$(git config branch.local/a/master.remote)" = "c" &&
928 test "$(git config branch.local/a/master.merge)" = "refs/remotes/a/master" &&
929 git rev-parse --verify a >expect &&
930 git rev-parse --verify local/a/master >actual &&
931 test_cmp expect actual
935 test_done