3 # Copyright (c) 2006 Junio C Hamano
6 test_description
='git checkout tests.
8 Creates master, forks renamer and side branches from it.
9 Test switching across them.
11 ! [master] Initial A one, A two
12 * [renamer] Renamer R one->uno, M two
13 ! [side] Side M one, D two, A three
14 ! [simple] Simple D one, M two
16 + [simple] Simple D one, M two
17 + [side] Side M one, D two, A three
18 * [renamer] Renamer R one->uno, M two
19 +*++ [master] Initial A one, A two
35 test_expect_success setup
'
38 fill 1 2 3 4 5 6 7 8 >one &&
39 fill a b c d e >two &&
40 git add same one two &&
41 git commit -m "Initial A one, A two" &&
43 git checkout -b renamer &&
45 fill 1 3 4 5 6 7 8 >uno &&
47 fill a b c d e f >two &&
48 git commit -a -m "Renamer R one->uno, M two" &&
50 git checkout -b side master &&
51 fill 1 2 3 4 5 6 7 >one &&
52 fill A B C D E >three &&
54 git update-index --add --remove one two three &&
55 git commit -m "Side M one, D two, A three" &&
57 git checkout -b simple master &&
60 git commit -a -m "Simple D one, M two" &&
65 test_expect_success
"checkout from non-existing branch" '
67 git checkout -b delete-me master &&
68 git update-ref -d --no-deref refs/heads/delete-me &&
69 test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
70 git checkout master &&
71 test refs/heads/master = "$(git symbolic-ref HEAD)"
74 test_expect_success
"checkout with dirty tree without -m" '
76 fill 0 1 2 3 4 5 6 7 8 >one &&
82 echo "happy - failed correctly"
87 test_expect_success
"checkout with unrelated dirty tree without -m" '
89 git checkout -f master &&
90 fill 0 1 2 3 4 5 6 7 8 >same &&
92 git checkout side >messages &&
94 printf "M\t%s\n" same >messages.expect &&
95 test_cmp messages.expect messages
98 test_expect_success
"checkout -m with dirty tree" '
100 git checkout -f master &&
103 fill 0 1 2 3 4 5 6 7 8 >one &&
104 git checkout -m side > messages &&
106 test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
108 printf "M\t%s\n" one >expect.messages &&
109 test_cmp expect.messages messages &&
111 fill "M one" "A three" "D two" >expect.master &&
112 git diff --name-status master >current.master &&
113 test_cmp expect.master current.master &&
115 fill "M one" >expect.side &&
116 git diff --name-status side >current.side &&
117 test_cmp expect.side current.side &&
119 git diff --cached >current.index &&
120 test_must_be_empty current.index
123 test_expect_success
"checkout -m with dirty tree, renamed" '
125 git checkout -f master && git clean -f &&
127 fill 1 2 3 4 5 7 8 >one &&
128 if git checkout renamer
133 echo "happy - failed correctly"
136 git checkout -m renamer &&
137 fill 1 3 4 5 7 8 >expect &&
138 test_cmp expect uno &&
140 git diff --cached >current &&
141 test_must_be_empty current
145 test_expect_success
'checkout -m with merge conflict' '
147 git checkout -f master && git clean -f &&
149 fill 1 T 3 4 5 6 S 8 >one &&
150 if git checkout renamer
155 echo "happy - failed correctly"
158 git checkout -m renamer &&
160 git diff master:one :3:uno |
161 sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
162 fill d2 aT d7 aS >expect &&
163 test_cmp expect current &&
164 git diff --cached two >current &&
165 test_must_be_empty current
168 test_expect_success
'format of merge conflict from checkout -m' '
170 git checkout -f master && git clean -f &&
173 git checkout -m simple &&
175 git ls-files >current &&
176 fill same two two two >expect &&
177 test_cmp expect current &&
179 cat <<-EOF >expect &&
192 test_expect_success
'checkout --merge --conflict=diff3 <branch>' '
194 git checkout -f master && git reset --hard && git clean -f &&
197 git checkout --merge --conflict=diff3 simple &&
199 cat <<-EOF >expect &&
218 test_expect_success
'switch to another branch while carrying a deletion' '
220 git checkout -f master && git reset --hard && git clean -f &&
223 test_must_fail git checkout simple 2>errs &&
224 test_i18ngrep overwritten errs &&
226 test_must_fail git read-tree --quiet -m -u HEAD simple 2>errs &&
227 test_must_be_empty errs
230 test_expect_success
'checkout to detach HEAD (with advice declined)' '
232 git config advice.detachedHead false &&
233 git checkout -f renamer && git clean -f &&
234 git checkout renamer^ 2>messages &&
235 test_i18ngrep "HEAD is now at 7329388" messages &&
236 test_line_count = 1 messages &&
237 H=$(git rev-parse --verify HEAD) &&
238 M=$(git show-ref -s --verify refs/heads/master) &&
239 test "z$H" = "z$M" &&
240 if git symbolic-ref HEAD >/dev/null 2>&1
242 echo "OOPS, HEAD is still symbolic???"
249 test_expect_success
'checkout to detach HEAD' '
250 git config advice.detachedHead true &&
251 git checkout -f renamer && git clean -f &&
252 GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages &&
253 grep "HEAD is now at 7329388" messages &&
254 test_line_count -gt 1 messages &&
255 H=$(git rev-parse --verify HEAD) &&
256 M=$(git show-ref -s --verify refs/heads/master) &&
257 test "z$H" = "z$M" &&
258 if git symbolic-ref HEAD >/dev/null 2>&1
260 echo "OOPS, HEAD is still symbolic???"
267 test_expect_success
'checkout to detach HEAD with branchname^' '
269 git checkout -f master && git clean -f &&
270 git checkout renamer^ &&
271 H=$(git rev-parse --verify HEAD) &&
272 M=$(git show-ref -s --verify refs/heads/master) &&
273 test "z$H" = "z$M" &&
274 if git symbolic-ref HEAD >/dev/null 2>&1
276 echo "OOPS, HEAD is still symbolic???"
283 test_expect_success
'checkout to detach HEAD with :/message' '
285 git checkout -f master && git clean -f &&
286 git checkout ":/Initial" &&
287 H=$(git rev-parse --verify HEAD) &&
288 M=$(git show-ref -s --verify refs/heads/master) &&
289 test "z$H" = "z$M" &&
290 if git symbolic-ref HEAD >/dev/null 2>&1
292 echo "OOPS, HEAD is still symbolic???"
299 test_expect_success
'checkout to detach HEAD with HEAD^0' '
301 git checkout -f master && git clean -f &&
302 git checkout HEAD^0 &&
303 H=$(git rev-parse --verify HEAD) &&
304 M=$(git show-ref -s --verify refs/heads/master) &&
305 test "z$H" = "z$M" &&
306 if git symbolic-ref HEAD >/dev/null 2>&1
308 echo "OOPS, HEAD is still symbolic???"
315 test_expect_success
'checkout with ambiguous tag/branch names' '
318 git branch both master &&
320 git checkout master &&
323 H=$(git rev-parse --verify HEAD) &&
324 M=$(git show-ref -s --verify refs/heads/master) &&
325 test "z$H" = "z$M" &&
326 name=$(git symbolic-ref HEAD 2>/dev/null) &&
327 test "z$name" = zrefs/heads/both
331 test_expect_success
'checkout with ambiguous tag/branch names' '
334 git checkout master &&
336 git tag frotz side &&
337 git branch frotz master &&
339 git checkout master &&
341 git checkout tags/frotz &&
342 H=$(git rev-parse --verify HEAD) &&
343 S=$(git show-ref -s --verify refs/heads/side) &&
344 test "z$H" = "z$S" &&
345 if name=$(git symbolic-ref HEAD 2>/dev/null)
347 echo "Bad -- should have detached"
355 test_expect_success
'switch branches while in subdirectory' '
358 git checkout master &&
365 ! test -f subs/one &&
370 test_expect_success
'checkout specific path while in subdirectory' '
377 git commit -m "add subs/bero" &&
379 git checkout master &&
383 git checkout side -- bero
389 test_expect_success \
390 'checkout w/--track sets up tracking' '
391 git config branch.autosetupmerge false &&
392 git checkout master &&
393 git checkout --track -b track1 &&
394 test "$(git config branch.track1.remote)" &&
395 test "$(git config branch.track1.merge)"'
397 test_expect_success \
398 'checkout w/autosetupmerge=always sets up tracking' '
399 test_when_finished git config branch.autosetupmerge false &&
400 git config branch.autosetupmerge always &&
401 git checkout master &&
402 git checkout -b track2 &&
403 test "$(git config branch.track2.remote)" &&
404 test "$(git config branch.track2.merge)"'
406 test_expect_success
'checkout w/--track from non-branch HEAD fails' '
407 git checkout master^0 &&
408 test_must_fail git symbolic-ref HEAD &&
409 test_must_fail git checkout --track -b track &&
410 test_must_fail git rev-parse --verify track &&
411 test_must_fail git symbolic-ref HEAD &&
412 test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
415 test_expect_success
'checkout w/--track from tag fails' '
416 git checkout master^0 &&
417 test_must_fail git symbolic-ref HEAD &&
418 test_must_fail git checkout --track -b track frotz &&
419 test_must_fail git rev-parse --verify track &&
420 test_must_fail git symbolic-ref HEAD &&
421 test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
424 test_expect_success
'detach a symbolic link HEAD' '
425 git checkout master &&
426 git config --bool core.prefersymlinkrefs yes &&
428 git checkout master &&
429 it=$(git symbolic-ref HEAD) &&
430 test "z$it" = zrefs/heads/master &&
431 here=$(git rev-parse --verify refs/heads/master) &&
432 git checkout side^ &&
433 test "z$(git rev-parse --verify refs/heads/master)" = "z$here"
436 test_expect_success \
437 'checkout with --track fakes a sensible -b <name>' '
438 git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
439 git update-ref refs/remotes/origin/koala/bear renamer &&
441 git checkout --track origin/koala/bear &&
442 test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
443 test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
445 git checkout master && git branch -D koala/bear &&
447 git checkout --track refs/remotes/origin/koala/bear &&
448 test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
449 test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
451 git checkout master && git branch -D koala/bear &&
453 git checkout --track remotes/origin/koala/bear &&
454 test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
455 test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
458 test_expect_success \
459 'checkout with --track, but without -b, fails with too short tracked name' '
460 test_must_fail git checkout --track renamer'
462 setup_conflicting_index
() {
464 O
=$
(echo original | git hash-object
-w --stdin) &&
465 A
=$
(echo ourside | git hash-object
-w --stdin) &&
466 B
=$
(echo theirside | git hash-object
-w --stdin) &&
468 echo "100644 $A 0 fild" &&
469 echo "100644 $O 1 file" &&
470 echo "100644 $A 2 file" &&
471 echo "100644 $B 3 file" &&
472 echo "100644 $A 0 filf"
473 ) | git update-index
--index-info
476 test_expect_success
'checkout an unmerged path should fail' '
477 setup_conflicting_index &&
478 echo "none of the above" >sample &&
482 test_must_fail git checkout fild file filf &&
483 test_cmp sample fild &&
484 test_cmp sample filf &&
488 test_expect_success
'checkout with an unmerged path can be ignored' '
489 setup_conflicting_index &&
490 echo "none of the above" >sample &&
491 echo ourside >expect &&
495 git checkout -f fild file filf &&
496 test_cmp expect fild &&
497 test_cmp expect filf &&
501 test_expect_success
'checkout unmerged stage' '
502 setup_conflicting_index &&
503 echo "none of the above" >sample &&
504 echo ourside >expect &&
508 git checkout --ours . &&
509 test_cmp expect fild &&
510 test_cmp expect filf &&
511 test_cmp expect file &&
512 git checkout --theirs file &&
513 test ztheirside = "z$(cat file)"
516 test_expect_success
'checkout with --merge' '
517 setup_conflicting_index &&
518 echo "none of the above" >sample &&
519 echo ourside >expect &&
523 git checkout -m -- fild file filf &&
525 echo "<<<<<<< ours" &&
529 echo ">>>>>>> theirs"
531 test_cmp expect fild &&
532 test_cmp expect filf &&
536 test_expect_success
'checkout with --merge, in diff3 -m style' '
537 git config merge.conflictstyle diff3 &&
538 setup_conflicting_index &&
539 echo "none of the above" >sample &&
540 echo ourside >expect &&
544 git checkout -m -- fild file filf &&
546 echo "<<<<<<< ours" &&
548 echo "||||||| base" &&
552 echo ">>>>>>> theirs"
554 test_cmp expect fild &&
555 test_cmp expect filf &&
559 test_expect_success
'checkout --conflict=merge, overriding config' '
560 git config merge.conflictstyle diff3 &&
561 setup_conflicting_index &&
562 echo "none of the above" >sample &&
563 echo ourside >expect &&
567 git checkout --conflict=merge -- fild file filf &&
569 echo "<<<<<<< ours" &&
573 echo ">>>>>>> theirs"
575 test_cmp expect fild &&
576 test_cmp expect filf &&
580 test_expect_success
'checkout --conflict=diff3' '
581 test_unconfig merge.conflictstyle &&
582 setup_conflicting_index &&
583 echo "none of the above" >sample &&
584 echo ourside >expect &&
588 git checkout --conflict=diff3 -- fild file filf &&
590 echo "<<<<<<< ours" &&
592 echo "||||||| base" &&
596 echo ">>>>>>> theirs"
598 test_cmp expect fild &&
599 test_cmp expect filf &&
603 test_expect_success
'failing checkout -b should not break working tree' '
604 git reset --hard master &&
605 git symbolic-ref HEAD refs/heads/master &&
606 test_must_fail git checkout -b renamer side^ &&
607 test $(git symbolic-ref HEAD) = refs/heads/master &&
608 git diff --exit-code &&
609 git diff --cached --exit-code
613 test_expect_success
'switch out of non-branch' '
614 git reset --hard master &&
615 git checkout master^0 &&
616 echo modified >one &&
617 test_must_fail git checkout renamer 2>error.log &&
618 ! grep "^Previous HEAD" error.log
627 echo '<<<<<<< filfre-theirs'
629 echo '||||||| filfre-common
'
633 echo '>>>>>>> filfre-ours
'
640 test_expect_success 'custom merge driver with checkout
-m' '
643 git config merge.filfre.driver
"./filfre.sh %O %A %B" &&
644 git config merge.filfre.name
"Feel-free merge driver" &&
645 git config merge.filfre.recursive binary
&&
646 echo "arm merge=filfre" >.gitattributes
&&
648 git checkout
-b left
&&
650 git add arm .gitattributes
&&
652 git commit
-m neutral
&&
657 git commit
-a -m left
&&
658 git checkout right
&&
662 git commit
-a -m right
&&
664 test_must_fail git merge left
&&
666 for t
in filfre-common left right
668 grep $t arm ||
exit 1
673 git checkout
-m arm
&&