]>
git.ipfire.org Git - thirdparty/git.git/blob - t/t2018-checkout-branch.sh
3 test_description
='checkout '
7 # Arguments: <branch> <sha> [<checkout options>]
9 # Runs "git checkout" to switch to <branch>, testing that
11 # 1) we are on the specified branch, <branch>;
12 # 2) HEAD is <sha>; if <sha> is not specified, the old HEAD is used.
14 # If <checkout options> is not specified, "git checkout" is run with -b.
17 exp_ref
="refs/heads/$exp_branch" &&
19 # if <sha> is not specified, use HEAD.
20 exp_sha
=${2:-$(git rev-parse --verify HEAD)} &&
22 # default options for git checkout: -b
29 git checkout
$opts $exp_branch $exp_sha &&
31 test $exp_ref = $
(git rev-parse
--symbolic-full-name HEAD
) &&
32 test $exp_sha = $
(git rev-parse
--verify HEAD
)
35 test_dirty_unmergeable
() {
36 ! git
diff --exit-code >/dev
/null
39 setup_dirty_unmergeable
() {
43 test_dirty_mergeable
() {
44 ! git
diff --cached --exit-code >/dev
/null
47 setup_dirty_mergeable
() {
52 test_expect_success
'setup' '
53 test_commit initial file1 &&
54 HEAD1=$(git rev-parse --verify HEAD) &&
56 test_commit change1 file1 &&
57 HEAD2=$(git rev-parse --verify HEAD) &&
62 test_expect_success
'checkout -b to a new branch, set to HEAD' '
64 git checkout branch1 &&
65 test_might_fail git branch -D branch2" &&
69 test_expect_success
'checkout -b to a new branch, set to an explicit ref' '
71 git checkout branch1 &&
72 test_might_fail git branch -D branch2" &&
73 do_checkout branch2 $HEAD1
76 test_expect_success
'checkout -b to a new branch with unmergeable changes fails' '
77 setup_dirty_unmergeable &&
78 test_must_fail do_checkout branch2 $HEAD1 &&
79 test_dirty_unmergeable
82 test_expect_success
'checkout -f -b to a new branch with unmergeable changes discards changes' '
84 git checkout branch1 &&
85 test_might_fail git branch -D branch2" &&
87 # still dirty and on branch1
88 do_checkout branch2 $HEAD1 "-f -b" &&
89 test_must_fail test_dirty_unmergeable
92 test_expect_success
'checkout -b to a new branch preserves mergeable changes' '
95 git checkout branch1 &&
96 test_might_fail git branch -D branch2" &&
98 setup_dirty_mergeable &&
99 do_checkout branch2 $HEAD1 &&
103 test_expect_success
'checkout -f -b to a new branch with mergeable changes discards changes' '
104 test_when_finished git reset --hard HEAD &&
105 setup_dirty_mergeable &&
106 do_checkout branch2 $HEAD1 "-f -b" &&
107 test_must_fail test_dirty_mergeable
110 test_expect_success
'checkout -b to an existing branch fails' '
111 test_when_finished git reset --hard HEAD &&
112 test_must_fail do_checkout branch2 $HEAD2
115 test_expect_success
'checkout -b to @{-1} fails with the right branch name' '
116 git checkout branch1 &&
117 git checkout branch2 &&
118 echo >expect "fatal: A branch named '\''branch1'\'' already exists." &&
119 test_must_fail git checkout -b @{-1} 2>actual &&
120 test_i18ncmp expect actual
123 test_expect_success
'checkout -B to an existing branch resets branch to HEAD' '
124 git checkout branch1 &&
126 do_checkout branch2 "" -B
129 test_expect_success
'checkout -B to an existing branch from detached HEAD resets branch to HEAD' '
130 git checkout $(git rev-parse --verify HEAD) &&
132 do_checkout branch2 "" -B
135 test_expect_success
'checkout -B to an existing branch with an explicit ref resets branch to that ref' '
136 git checkout branch1 &&
138 do_checkout branch2 $HEAD1 -B
141 test_expect_success
'checkout -B to an existing branch with unmergeable changes fails' '
142 git checkout branch1 &&
144 setup_dirty_unmergeable &&
145 test_must_fail do_checkout branch2 $HEAD1 -B &&
146 test_dirty_unmergeable
149 test_expect_success
'checkout -f -B to an existing branch with unmergeable changes discards changes' '
150 # still dirty and on branch1
151 do_checkout branch2 $HEAD1 "-f -B" &&
152 test_must_fail test_dirty_unmergeable
155 test_expect_success
'checkout -B to an existing branch preserves mergeable changes' '
156 test_when_finished git reset --hard &&
157 git checkout branch1 &&
159 setup_dirty_mergeable &&
160 do_checkout branch2 $HEAD1 -B &&
164 test_expect_success
'checkout -f -B to an existing branch with mergeable changes discards changes' '
165 git checkout branch1 &&
167 setup_dirty_mergeable &&
168 do_checkout branch2 $HEAD1 "-f -B" &&
169 test_must_fail test_dirty_mergeable
172 test_expect_success
'checkout -b <describe>' '
173 git tag -f -m "First commit" initial initial &&
174 git checkout -f change1 &&
175 name=$(git describe) &&
176 git checkout -b $name &&
177 git diff --exit-code change1 &&
178 echo "refs/heads/$name" >expect &&
179 git symbolic-ref HEAD >actual &&
180 test_cmp expect actual
183 test_expect_success
'checkout -B to the current branch works' '
184 git checkout branch1 &&
185 git checkout -B branch1-scratch &&
187 setup_dirty_mergeable &&
188 git checkout -B branch1-scratch initial &&
192 test_expect_success
'checkout -b after clone --no-checkout does a checkout of HEAD' '
194 test_commit -C src a &&
195 rev="$(git -C src rev-parse HEAD)" &&
196 git clone --no-checkout src dest &&
197 git -C dest checkout "$rev" -b branch &&
198 test_path_is_file dest/a.t