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 &&
229 git checkout --merge simple 2>errs &&
230 test_i18ngrep ! overwritten errs &&
232 test_must_fail git cat-file -t :0:two &&
233 test "$(git cat-file -t :1:two)" = blob &&
234 test "$(git cat-file -t :2:two)" = blob &&
235 test_must_fail git cat-file -t :3:two
238 test_expect_success
'checkout to detach HEAD (with advice declined)' '
240 git config advice.detachedHead false &&
241 git checkout -f renamer && git clean -f &&
242 git checkout renamer^ 2>messages &&
243 test_i18ngrep "HEAD is now at 7329388" messages &&
244 test_line_count = 1 messages &&
245 H=$(git rev-parse --verify HEAD) &&
246 M=$(git show-ref -s --verify refs/heads/master) &&
247 test "z$H" = "z$M" &&
248 if git symbolic-ref HEAD >/dev/null 2>&1
250 echo "OOPS, HEAD is still symbolic???"
257 test_expect_success
'checkout to detach HEAD' '
258 git config advice.detachedHead true &&
259 git checkout -f renamer && git clean -f &&
260 GIT_TEST_GETTEXT_POISON= git checkout renamer^ 2>messages &&
261 grep "HEAD is now at 7329388" messages &&
262 test_line_count -gt 1 messages &&
263 H=$(git rev-parse --verify HEAD) &&
264 M=$(git show-ref -s --verify refs/heads/master) &&
265 test "z$H" = "z$M" &&
266 if git symbolic-ref HEAD >/dev/null 2>&1
268 echo "OOPS, HEAD is still symbolic???"
275 test_expect_success
'checkout to detach HEAD with branchname^' '
277 git checkout -f master && git clean -f &&
278 git checkout renamer^ &&
279 H=$(git rev-parse --verify HEAD) &&
280 M=$(git show-ref -s --verify refs/heads/master) &&
281 test "z$H" = "z$M" &&
282 if git symbolic-ref HEAD >/dev/null 2>&1
284 echo "OOPS, HEAD is still symbolic???"
291 test_expect_success
'checkout to detach HEAD with :/message' '
293 git checkout -f master && git clean -f &&
294 git checkout ":/Initial" &&
295 H=$(git rev-parse --verify HEAD) &&
296 M=$(git show-ref -s --verify refs/heads/master) &&
297 test "z$H" = "z$M" &&
298 if git symbolic-ref HEAD >/dev/null 2>&1
300 echo "OOPS, HEAD is still symbolic???"
307 test_expect_success
'checkout to detach HEAD with HEAD^0' '
309 git checkout -f master && git clean -f &&
310 git checkout HEAD^0 &&
311 H=$(git rev-parse --verify HEAD) &&
312 M=$(git show-ref -s --verify refs/heads/master) &&
313 test "z$H" = "z$M" &&
314 if git symbolic-ref HEAD >/dev/null 2>&1
316 echo "OOPS, HEAD is still symbolic???"
323 test_expect_success
'checkout with ambiguous tag/branch names' '
326 git branch both master &&
328 git checkout master &&
331 H=$(git rev-parse --verify HEAD) &&
332 M=$(git show-ref -s --verify refs/heads/master) &&
333 test "z$H" = "z$M" &&
334 name=$(git symbolic-ref HEAD 2>/dev/null) &&
335 test "z$name" = zrefs/heads/both
339 test_expect_success
'checkout with ambiguous tag/branch names' '
342 git checkout master &&
344 git tag frotz side &&
345 git branch frotz master &&
347 git checkout master &&
349 git checkout tags/frotz &&
350 H=$(git rev-parse --verify HEAD) &&
351 S=$(git show-ref -s --verify refs/heads/side) &&
352 test "z$H" = "z$S" &&
353 if name=$(git symbolic-ref HEAD 2>/dev/null)
355 echo "Bad -- should have detached"
363 test_expect_success
'switch branches while in subdirectory' '
366 git checkout master &&
373 ! test -f subs/one &&
378 test_expect_success
'checkout specific path while in subdirectory' '
385 git commit -m "add subs/bero" &&
387 git checkout master &&
391 git checkout side -- bero
397 test_expect_success \
398 'checkout w/--track sets up tracking' '
399 git config branch.autosetupmerge false &&
400 git checkout master &&
401 git checkout --track -b track1 &&
402 test "$(git config branch.track1.remote)" &&
403 test "$(git config branch.track1.merge)"'
405 test_expect_success \
406 'checkout w/autosetupmerge=always sets up tracking' '
407 test_when_finished git config branch.autosetupmerge false &&
408 git config branch.autosetupmerge always &&
409 git checkout master &&
410 git checkout -b track2 &&
411 test "$(git config branch.track2.remote)" &&
412 test "$(git config branch.track2.merge)"'
414 test_expect_success
'checkout w/--track from non-branch HEAD fails' '
415 git checkout master^0 &&
416 test_must_fail git symbolic-ref HEAD &&
417 test_must_fail git checkout --track -b track &&
418 test_must_fail git rev-parse --verify track &&
419 test_must_fail git symbolic-ref HEAD &&
420 test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
423 test_expect_success
'checkout w/--track from tag fails' '
424 git checkout master^0 &&
425 test_must_fail git symbolic-ref HEAD &&
426 test_must_fail git checkout --track -b track frotz &&
427 test_must_fail git rev-parse --verify track &&
428 test_must_fail git symbolic-ref HEAD &&
429 test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
432 test_expect_success
'detach a symbolic link HEAD' '
433 git checkout master &&
434 git config --bool core.prefersymlinkrefs yes &&
436 git checkout master &&
437 it=$(git symbolic-ref HEAD) &&
438 test "z$it" = zrefs/heads/master &&
439 here=$(git rev-parse --verify refs/heads/master) &&
440 git checkout side^ &&
441 test "z$(git rev-parse --verify refs/heads/master)" = "z$here"
444 test_expect_success \
445 'checkout with --track fakes a sensible -b <name>' '
446 git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
447 git update-ref refs/remotes/origin/koala/bear renamer &&
449 git checkout --track origin/koala/bear &&
450 test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
451 test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
453 git checkout master && git branch -D koala/bear &&
455 git checkout --track refs/remotes/origin/koala/bear &&
456 test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
457 test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
459 git checkout master && git branch -D koala/bear &&
461 git checkout --track remotes/origin/koala/bear &&
462 test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
463 test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
466 test_expect_success \
467 'checkout with --track, but without -b, fails with too short tracked name' '
468 test_must_fail git checkout --track renamer'
470 setup_conflicting_index
() {
472 O
=$
(echo original | git hash-object
-w --stdin) &&
473 A
=$
(echo ourside | git hash-object
-w --stdin) &&
474 B
=$
(echo theirside | git hash-object
-w --stdin) &&
476 echo "100644 $A 0 fild" &&
477 echo "100644 $O 1 file" &&
478 echo "100644 $A 2 file" &&
479 echo "100644 $B 3 file" &&
480 echo "100644 $A 0 filf"
481 ) | git update-index
--index-info
484 test_expect_success
'checkout an unmerged path should fail' '
485 setup_conflicting_index &&
486 echo "none of the above" >sample &&
490 test_must_fail git checkout fild file filf &&
491 test_cmp sample fild &&
492 test_cmp sample filf &&
496 test_expect_success
'checkout with an unmerged path can be ignored' '
497 setup_conflicting_index &&
498 echo "none of the above" >sample &&
499 echo ourside >expect &&
503 git checkout -f fild file filf &&
504 test_cmp expect fild &&
505 test_cmp expect filf &&
509 test_expect_success
'checkout unmerged stage' '
510 setup_conflicting_index &&
511 echo "none of the above" >sample &&
512 echo ourside >expect &&
516 git checkout --ours . &&
517 test_cmp expect fild &&
518 test_cmp expect filf &&
519 test_cmp expect file &&
520 git checkout --theirs file &&
521 test ztheirside = "z$(cat file)"
524 test_expect_success
'checkout with --merge' '
525 setup_conflicting_index &&
526 echo "none of the above" >sample &&
527 echo ourside >expect &&
531 git checkout -m -- fild file filf &&
533 echo "<<<<<<< ours" &&
537 echo ">>>>>>> theirs"
539 test_cmp expect fild &&
540 test_cmp expect filf &&
544 test_expect_success
'checkout with --merge, in diff3 -m style' '
545 git config merge.conflictstyle diff3 &&
546 setup_conflicting_index &&
547 echo "none of the above" >sample &&
548 echo ourside >expect &&
552 git checkout -m -- fild file filf &&
554 echo "<<<<<<< ours" &&
556 echo "||||||| base" &&
560 echo ">>>>>>> theirs"
562 test_cmp expect fild &&
563 test_cmp expect filf &&
567 test_expect_success
'checkout --conflict=merge, overriding config' '
568 git config merge.conflictstyle diff3 &&
569 setup_conflicting_index &&
570 echo "none of the above" >sample &&
571 echo ourside >expect &&
575 git checkout --conflict=merge -- fild file filf &&
577 echo "<<<<<<< ours" &&
581 echo ">>>>>>> theirs"
583 test_cmp expect fild &&
584 test_cmp expect filf &&
588 test_expect_success
'checkout --conflict=diff3' '
589 test_unconfig merge.conflictstyle &&
590 setup_conflicting_index &&
591 echo "none of the above" >sample &&
592 echo ourside >expect &&
596 git checkout --conflict=diff3 -- fild file filf &&
598 echo "<<<<<<< ours" &&
600 echo "||||||| base" &&
604 echo ">>>>>>> theirs"
606 test_cmp expect fild &&
607 test_cmp expect filf &&
611 test_expect_success
'failing checkout -b should not break working tree' '
612 git reset --hard master &&
613 git symbolic-ref HEAD refs/heads/master &&
614 test_must_fail git checkout -b renamer side^ &&
615 test $(git symbolic-ref HEAD) = refs/heads/master &&
616 git diff --exit-code &&
617 git diff --cached --exit-code
621 test_expect_success
'switch out of non-branch' '
622 git reset --hard master &&
623 git checkout master^0 &&
624 echo modified >one &&
625 test_must_fail git checkout renamer 2>error.log &&
626 ! grep "^Previous HEAD" error.log
635 echo '<<<<<<< filfre-theirs'
637 echo '||||||| filfre-common
'
641 echo '>>>>>>> filfre-ours
'
648 test_expect_success 'custom merge driver with checkout
-m' '
651 git config merge.filfre.driver
"./filfre.sh %O %A %B" &&
652 git config merge.filfre.name
"Feel-free merge driver" &&
653 git config merge.filfre.recursive binary
&&
654 echo "arm merge=filfre" >.gitattributes
&&
656 git checkout
-b left
&&
658 git add arm .gitattributes
&&
660 git commit
-m neutral
&&
665 git commit
-a -m left
&&
666 git checkout right
&&
670 git commit
-a -m right
&&
672 test_must_fail git merge left
&&
674 for t
in filfre-common left right
676 grep $t arm ||
exit 1
681 git checkout
-m arm
&&