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