Merge branch 'ab/blame-textconv'
[git/dscho.git] / t / t3200-branch.sh
blob859b99abf1cc62c966322fcfc552c0a7eb7356df
1 #!/bin/sh
3 # Copyright (c) 2005 Amos Waterland
6 test_description='git branch --foo should not create bogus branch
8 This test runs git branch --help and checks that the argument is properly
9 handled. Specifically, that a bogus branch is not created.
11 . ./test-lib.sh
13 test_expect_success \
14 'prepare a trivial repository' \
15 'echo Hello > A &&
16 git update-index --add A &&
17 git commit -m "Initial commit." &&
18 echo World >> A &&
19 git update-index --add A &&
20 git commit -m "Second commit." &&
21 HEAD=$(git rev-parse --verify HEAD)'
23 test_expect_success \
24 'git branch --help should not have created a bogus branch' '
25 git branch --help </dev/null >/dev/null 2>/dev/null;
26 ! test -f .git/refs/heads/--help
29 test_expect_success \
30 'git branch abc should create a branch' \
31 'git branch abc && test -f .git/refs/heads/abc'
33 test_expect_success \
34 'git branch a/b/c should create a branch' \
35 'git branch a/b/c && test -f .git/refs/heads/a/b/c'
37 cat >expect <<EOF
38 0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
39 EOF
40 test_expect_success \
41 'git branch -l d/e/f should create a branch and a log' \
42 'GIT_COMMITTER_DATE="2005-05-26 23:30" \
43 git branch -l d/e/f &&
44 test -f .git/refs/heads/d/e/f &&
45 test -f .git/logs/refs/heads/d/e/f &&
46 test_cmp expect .git/logs/refs/heads/d/e/f'
48 test_expect_success \
49 'git branch -d d/e/f should delete a branch and a log' \
50 'git branch -d d/e/f &&
51 test ! -f .git/refs/heads/d/e/f &&
52 test ! -f .git/logs/refs/heads/d/e/f'
54 test_expect_success \
55 'git branch j/k should work after branch j has been deleted' \
56 'git branch j &&
57 git branch -d j &&
58 git branch j/k'
60 test_expect_success \
61 'git branch l should work after branch l/m has been deleted' \
62 'git branch l/m &&
63 git branch -d l/m &&
64 git branch l'
66 test_expect_success \
67 'git branch -m m m/m should work' \
68 'git branch -l m &&
69 git branch -m m m/m &&
70 test -f .git/logs/refs/heads/m/m'
72 test_expect_success \
73 'git branch -m n/n n should work' \
74 'git branch -l n/n &&
75 git branch -m n/n n
76 test -f .git/logs/refs/heads/n'
78 test_expect_success 'git branch -m o/o o should fail when o/p exists' '
79 git branch o/o &&
80 git branch o/p &&
81 test_must_fail git branch -m o/o o
84 test_expect_success 'git branch -m q r/q should fail when r exists' '
85 git branch q &&
86 git branch r &&
87 test_must_fail git branch -m q r/q
90 mv .git/config .git/config-saved
92 test_expect_success 'git branch -m q q2 without config should succeed' '
93 git branch -m q q2 &&
94 git branch -m q2 q
97 mv .git/config-saved .git/config
99 git config branch.s/s.dummy Hello
101 test_expect_success \
102 'git branch -m s/s s should work when s/t is deleted' \
103 'git branch -l s/s &&
104 test -f .git/logs/refs/heads/s/s &&
105 git branch -l s/t &&
106 test -f .git/logs/refs/heads/s/t &&
107 git branch -d s/t &&
108 git branch -m s/s s &&
109 test -f .git/logs/refs/heads/s'
111 test_expect_success 'config information was renamed, too' \
112 "test $(git config branch.s.dummy) = Hello &&
113 test_must_fail git config branch.s/s/dummy"
115 test_expect_success 'renaming a symref is not allowed' \
117 git symbolic-ref refs/heads/master2 refs/heads/master &&
118 test_must_fail git branch -m master2 master3 &&
119 git symbolic-ref refs/heads/master2 &&
120 test -f .git/refs/heads/master &&
121 ! test -f .git/refs/heads/master3
124 test_expect_success SYMLINKS \
125 'git branch -m u v should fail when the reflog for u is a symlink' '
126 git branch -l u &&
127 mv .git/logs/refs/heads/u real-u &&
128 ln -s real-u .git/logs/refs/heads/u &&
129 test_must_fail git branch -m u v
132 test_expect_success 'test tracking setup via --track' \
133 'git config remote.local.url . &&
134 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
135 (git show-ref -q refs/remotes/local/master || git fetch local) &&
136 git branch --track my1 local/master &&
137 test $(git config branch.my1.remote) = local &&
138 test $(git config branch.my1.merge) = refs/heads/master'
140 test_expect_success 'test tracking setup (non-wildcard, matching)' \
141 'git config remote.local.url . &&
142 git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&
143 (git show-ref -q refs/remotes/local/master || git fetch local) &&
144 git branch --track my4 local/master &&
145 test $(git config branch.my4.remote) = local &&
146 test $(git config branch.my4.merge) = refs/heads/master'
148 test_expect_success 'test tracking setup (non-wildcard, not matching)' \
149 'git config remote.local.url . &&
150 git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
151 (git show-ref -q refs/remotes/local/master || git fetch local) &&
152 git branch --track my5 local/master &&
153 ! test "$(git config branch.my5.remote)" = local &&
154 ! test "$(git config branch.my5.merge)" = refs/heads/master'
156 test_expect_success 'test tracking setup via config' \
157 'git config branch.autosetupmerge true &&
158 git config remote.local.url . &&
159 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
160 (git show-ref -q refs/remotes/local/master || git fetch local) &&
161 git branch my3 local/master &&
162 test $(git config branch.my3.remote) = local &&
163 test $(git config branch.my3.merge) = refs/heads/master'
165 test_expect_success 'test overriding tracking setup via --no-track' \
166 'git config branch.autosetupmerge true &&
167 git config remote.local.url . &&
168 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
169 (git show-ref -q refs/remotes/local/master || git fetch local) &&
170 git branch --no-track my2 local/master &&
171 git config branch.autosetupmerge false &&
172 ! test "$(git config branch.my2.remote)" = local &&
173 ! test "$(git config branch.my2.merge)" = refs/heads/master'
175 test_expect_success 'no tracking without .fetch entries' \
176 'git config branch.autosetupmerge true &&
177 git branch my6 s &&
178 git config branch.automsetupmerge false &&
179 test -z "$(git config branch.my6.remote)" &&
180 test -z "$(git config branch.my6.merge)"'
182 test_expect_success 'test tracking setup via --track but deeper' \
183 'git config remote.local.url . &&
184 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
185 (git show-ref -q refs/remotes/local/o/o || git fetch local) &&
186 git branch --track my7 local/o/o &&
187 test "$(git config branch.my7.remote)" = local &&
188 test "$(git config branch.my7.merge)" = refs/heads/o/o'
190 test_expect_success 'test deleting branch deletes branch config' \
191 'git branch -d my7 &&
192 test -z "$(git config branch.my7.remote)" &&
193 test -z "$(git config branch.my7.merge)"'
195 test_expect_success 'test deleting branch without config' \
196 'git branch my7 s &&
197 sha1=$(git rev-parse my7 | cut -c 1-7) &&
198 test "$(git branch -d my7 2>&1)" = "Deleted branch my7 (was $sha1)."'
200 test_expect_success 'test --track without .fetch entries' \
201 'git branch --track my8 &&
202 test "$(git config branch.my8.remote)" &&
203 test "$(git config branch.my8.merge)"'
205 test_expect_success \
206 'branch from non-branch HEAD w/autosetupmerge=always' \
207 'git config branch.autosetupmerge always &&
208 git branch my9 HEAD^ &&
209 git config branch.autosetupmerge false'
211 test_expect_success \
212 'branch from non-branch HEAD w/--track causes failure' \
213 'test_must_fail git branch --track my10 HEAD^'
215 # Keep this test last, as it changes the current branch
216 cat >expect <<EOF
217 0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
219 test_expect_success \
220 'git checkout -b g/h/i -l should create a branch and a log' \
221 'GIT_COMMITTER_DATE="2005-05-26 23:30" \
222 git checkout -b g/h/i -l master &&
223 test -f .git/refs/heads/g/h/i &&
224 test -f .git/logs/refs/heads/g/h/i &&
225 test_cmp expect .git/logs/refs/heads/g/h/i'
227 test_expect_success 'checkout -b makes reflog by default' '
228 git checkout master &&
229 git config --unset core.logAllRefUpdates &&
230 git checkout -b alpha &&
231 test -f .git/logs/refs/heads/alpha &&
232 PAGER= git reflog show alpha
235 test_expect_success 'checkout -b does not make reflog when core.logAllRefUpdates = false' '
236 git checkout master &&
237 git config core.logAllRefUpdates false &&
238 git checkout -b beta &&
239 ! test -f .git/logs/refs/heads/beta &&
240 test_must_fail PAGER= git reflog show beta
243 test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' '
244 git checkout master &&
245 git checkout -lb gamma &&
246 git config --unset core.logAllRefUpdates &&
247 test -f .git/logs/refs/heads/gamma &&
248 PAGER= git reflog show gamma
251 test_expect_success 'avoid ambiguous track' '
252 git config branch.autosetupmerge true &&
253 git config remote.ambi1.url lalala &&
254 git config remote.ambi1.fetch refs/heads/lalala:refs/heads/master &&
255 git config remote.ambi2.url lilili &&
256 git config remote.ambi2.fetch refs/heads/lilili:refs/heads/master &&
257 git branch all1 master &&
258 test -z "$(git config branch.all1.merge)"
261 test_expect_success 'autosetuprebase local on a tracked local branch' '
262 git config remote.local.url . &&
263 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
264 git config branch.autosetuprebase local &&
265 (git show-ref -q refs/remotes/local/o || git fetch local) &&
266 git branch mybase &&
267 git branch --track myr1 mybase &&
268 test "$(git config branch.myr1.remote)" = . &&
269 test "$(git config branch.myr1.merge)" = refs/heads/mybase &&
270 test "$(git config branch.myr1.rebase)" = true
273 test_expect_success 'autosetuprebase always on a tracked local branch' '
274 git config remote.local.url . &&
275 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
276 git config branch.autosetuprebase always &&
277 (git show-ref -q refs/remotes/local/o || git fetch local) &&
278 git branch mybase2 &&
279 git branch --track myr2 mybase &&
280 test "$(git config branch.myr2.remote)" = . &&
281 test "$(git config branch.myr2.merge)" = refs/heads/mybase &&
282 test "$(git config branch.myr2.rebase)" = true
285 test_expect_success 'autosetuprebase remote on a tracked local branch' '
286 git config remote.local.url . &&
287 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
288 git config branch.autosetuprebase remote &&
289 (git show-ref -q refs/remotes/local/o || git fetch local) &&
290 git branch mybase3 &&
291 git branch --track myr3 mybase2 &&
292 test "$(git config branch.myr3.remote)" = . &&
293 test "$(git config branch.myr3.merge)" = refs/heads/mybase2 &&
294 ! test "$(git config branch.myr3.rebase)" = true
297 test_expect_success 'autosetuprebase never on a tracked local branch' '
298 git config remote.local.url . &&
299 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
300 git config branch.autosetuprebase never &&
301 (git show-ref -q refs/remotes/local/o || git fetch local) &&
302 git branch mybase4 &&
303 git branch --track myr4 mybase2 &&
304 test "$(git config branch.myr4.remote)" = . &&
305 test "$(git config branch.myr4.merge)" = refs/heads/mybase2 &&
306 ! test "$(git config branch.myr4.rebase)" = true
309 test_expect_success 'autosetuprebase local on a tracked remote branch' '
310 git config remote.local.url . &&
311 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
312 git config branch.autosetuprebase local &&
313 (git show-ref -q refs/remotes/local/master || git fetch local) &&
314 git branch --track myr5 local/master &&
315 test "$(git config branch.myr5.remote)" = local &&
316 test "$(git config branch.myr5.merge)" = refs/heads/master &&
317 ! test "$(git config branch.myr5.rebase)" = true
320 test_expect_success 'autosetuprebase never on a tracked remote branch' '
321 git config remote.local.url . &&
322 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
323 git config branch.autosetuprebase never &&
324 (git show-ref -q refs/remotes/local/master || git fetch local) &&
325 git branch --track myr6 local/master &&
326 test "$(git config branch.myr6.remote)" = local &&
327 test "$(git config branch.myr6.merge)" = refs/heads/master &&
328 ! test "$(git config branch.myr6.rebase)" = true
331 test_expect_success 'autosetuprebase remote on a tracked remote branch' '
332 git config remote.local.url . &&
333 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
334 git config branch.autosetuprebase remote &&
335 (git show-ref -q refs/remotes/local/master || git fetch local) &&
336 git branch --track myr7 local/master &&
337 test "$(git config branch.myr7.remote)" = local &&
338 test "$(git config branch.myr7.merge)" = refs/heads/master &&
339 test "$(git config branch.myr7.rebase)" = true
342 test_expect_success 'autosetuprebase always on a tracked remote branch' '
343 git config remote.local.url . &&
344 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
345 git config branch.autosetuprebase remote &&
346 (git show-ref -q refs/remotes/local/master || git fetch local) &&
347 git branch --track myr8 local/master &&
348 test "$(git config branch.myr8.remote)" = local &&
349 test "$(git config branch.myr8.merge)" = refs/heads/master &&
350 test "$(git config branch.myr8.rebase)" = true
353 test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' '
354 git config --unset branch.autosetuprebase &&
355 git config remote.local.url . &&
356 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
357 (git show-ref -q refs/remotes/local/master || git fetch local) &&
358 git branch --track myr9 local/master &&
359 test "$(git config branch.myr9.remote)" = local &&
360 test "$(git config branch.myr9.merge)" = refs/heads/master &&
361 test "z$(git config branch.myr9.rebase)" = z
364 test_expect_success 'autosetuprebase unconfigured on a tracked local branch' '
365 git config remote.local.url . &&
366 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
367 (git show-ref -q refs/remotes/local/o || git fetch local) &&
368 git branch mybase10 &&
369 git branch --track myr10 mybase2 &&
370 test "$(git config branch.myr10.remote)" = . &&
371 test "$(git config branch.myr10.merge)" = refs/heads/mybase2 &&
372 test "z$(git config branch.myr10.rebase)" = z
375 test_expect_success 'autosetuprebase unconfigured on untracked local branch' '
376 git config remote.local.url . &&
377 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
378 (git show-ref -q refs/remotes/local/master || git fetch local) &&
379 git branch --no-track myr11 mybase2 &&
380 test "z$(git config branch.myr11.remote)" = z &&
381 test "z$(git config branch.myr11.merge)" = z &&
382 test "z$(git config branch.myr11.rebase)" = z
385 test_expect_success 'autosetuprebase unconfigured on untracked remote branch' '
386 git config remote.local.url . &&
387 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
388 (git show-ref -q refs/remotes/local/master || git fetch local) &&
389 git branch --no-track myr12 local/master &&
390 test "z$(git config branch.myr12.remote)" = z &&
391 test "z$(git config branch.myr12.merge)" = z &&
392 test "z$(git config branch.myr12.rebase)" = z
395 test_expect_success 'autosetuprebase never on an untracked local branch' '
396 git config branch.autosetuprebase never &&
397 git config remote.local.url . &&
398 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
399 (git show-ref -q refs/remotes/local/master || git fetch local) &&
400 git branch --no-track myr13 mybase2 &&
401 test "z$(git config branch.myr13.remote)" = z &&
402 test "z$(git config branch.myr13.merge)" = z &&
403 test "z$(git config branch.myr13.rebase)" = z
406 test_expect_success 'autosetuprebase local on an untracked local branch' '
407 git config branch.autosetuprebase local &&
408 git config remote.local.url . &&
409 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
410 (git show-ref -q refs/remotes/local/master || git fetch local) &&
411 git branch --no-track myr14 mybase2 &&
412 test "z$(git config branch.myr14.remote)" = z &&
413 test "z$(git config branch.myr14.merge)" = z &&
414 test "z$(git config branch.myr14.rebase)" = z
417 test_expect_success 'autosetuprebase remote on an untracked local branch' '
418 git config branch.autosetuprebase remote &&
419 git config remote.local.url . &&
420 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
421 (git show-ref -q refs/remotes/local/master || git fetch local) &&
422 git branch --no-track myr15 mybase2 &&
423 test "z$(git config branch.myr15.remote)" = z &&
424 test "z$(git config branch.myr15.merge)" = z &&
425 test "z$(git config branch.myr15.rebase)" = z
428 test_expect_success 'autosetuprebase always on an untracked local branch' '
429 git config branch.autosetuprebase always &&
430 git config remote.local.url . &&
431 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
432 (git show-ref -q refs/remotes/local/master || git fetch local) &&
433 git branch --no-track myr16 mybase2 &&
434 test "z$(git config branch.myr16.remote)" = z &&
435 test "z$(git config branch.myr16.merge)" = z &&
436 test "z$(git config branch.myr16.rebase)" = z
439 test_expect_success 'autosetuprebase never on an untracked remote branch' '
440 git config branch.autosetuprebase never &&
441 git config remote.local.url . &&
442 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
443 (git show-ref -q refs/remotes/local/master || git fetch local) &&
444 git branch --no-track myr17 local/master &&
445 test "z$(git config branch.myr17.remote)" = z &&
446 test "z$(git config branch.myr17.merge)" = z &&
447 test "z$(git config branch.myr17.rebase)" = z
450 test_expect_success 'autosetuprebase local on an untracked remote branch' '
451 git config branch.autosetuprebase local &&
452 git config remote.local.url . &&
453 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
454 (git show-ref -q refs/remotes/local/master || git fetch local) &&
455 git branch --no-track myr18 local/master &&
456 test "z$(git config branch.myr18.remote)" = z &&
457 test "z$(git config branch.myr18.merge)" = z &&
458 test "z$(git config branch.myr18.rebase)" = z
461 test_expect_success 'autosetuprebase remote on an untracked remote branch' '
462 git config branch.autosetuprebase remote &&
463 git config remote.local.url . &&
464 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
465 (git show-ref -q refs/remotes/local/master || git fetch local) &&
466 git branch --no-track myr19 local/master &&
467 test "z$(git config branch.myr19.remote)" = z &&
468 test "z$(git config branch.myr19.merge)" = z &&
469 test "z$(git config branch.myr19.rebase)" = z
472 test_expect_success 'autosetuprebase always on an untracked remote branch' '
473 git config branch.autosetuprebase always &&
474 git config remote.local.url . &&
475 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
476 (git show-ref -q refs/remotes/local/master || git fetch local) &&
477 git branch --no-track myr20 local/master &&
478 test "z$(git config branch.myr20.remote)" = z &&
479 test "z$(git config branch.myr20.merge)" = z &&
480 test "z$(git config branch.myr20.rebase)" = z
483 test_expect_success 'detect misconfigured autosetuprebase (bad value)' '
484 git config branch.autosetuprebase garbage &&
485 test_must_fail git branch
488 test_expect_success 'detect misconfigured autosetuprebase (no value)' '
489 git config --unset branch.autosetuprebase &&
490 echo "[branch] autosetuprebase" >> .git/config &&
491 test_must_fail git branch &&
492 git config --unset branch.autosetuprebase
495 test_expect_success 'attempt to delete a branch without base and unmerged to HEAD' '
496 git checkout my9 &&
497 git config --unset branch.my8.merge &&
498 test_must_fail git branch -d my8
501 test_expect_success 'attempt to delete a branch merged to its base' '
502 # we are on my9 which is the initial commit; traditionally
503 # we would not have allowed deleting my8 that is not merged
504 # to my9, but it is set to track master that already has my8
505 git config branch.my8.merge refs/heads/master &&
506 git branch -d my8
509 test_expect_success 'attempt to delete a branch merged to its base' '
510 git checkout master &&
511 echo Third >>A &&
512 git commit -m "Third commit" A &&
513 git branch -t my10 my9 &&
514 git branch -f my10 HEAD^ &&
515 # we are on master which is at the third commit, and my10
516 # is behind us, so traditionally we would have allowed deleting
517 # it; but my10 is set to track my9 that is further behind.
518 test_must_fail git branch -d my10
521 test_done