git-branch --track: fix tracking branch computation.
[git/git.git] / t / t3200-branch.sh
1 #!/bin/sh
2 #
3 # Copyright (c) 2005 Amos Waterland
4 #
5
6 test_description='git branch --foo should not create bogus branch
7
8 This test runs git branch --help and checks that the argument is properly
9 handled. Specifically, that a bogus branch is not created.
10 '
11 . ./test-lib.sh
12
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 HEAD=$(git-rev-parse --verify HEAD)'
19
20 test_expect_failure \
21 'git branch --help should not have created a bogus branch' \
22 'git-branch --help </dev/null >/dev/null 2>/dev/null || :
23 test -f .git/refs/heads/--help'
24
25 test_expect_success \
26 'git branch abc should create a branch' \
27 'git-branch abc && test -f .git/refs/heads/abc'
28
29 test_expect_success \
30 'git branch a/b/c should create a branch' \
31 'git-branch a/b/c && test -f .git/refs/heads/a/b/c'
32
33 cat >expect <<EOF
34 0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
35 EOF
36 test_expect_success \
37 'git branch -l d/e/f should create a branch and a log' \
38 'GIT_COMMITTER_DATE="2005-05-26 23:30" \
39 git-branch -l d/e/f &&
40 test -f .git/refs/heads/d/e/f &&
41 test -f .git/logs/refs/heads/d/e/f &&
42 diff expect .git/logs/refs/heads/d/e/f'
43
44 test_expect_success \
45 'git branch -d d/e/f should delete a branch and a log' \
46 'git-branch -d d/e/f &&
47 test ! -f .git/refs/heads/d/e/f &&
48 test ! -f .git/logs/refs/heads/d/e/f'
49
50 test_expect_success \
51 'git branch j/k should work after branch j has been deleted' \
52 'git-branch j &&
53 git-branch -d j &&
54 git-branch j/k'
55
56 test_expect_success \
57 'git branch l should work after branch l/m has been deleted' \
58 'git-branch l/m &&
59 git-branch -d l/m &&
60 git-branch l'
61
62 test_expect_success \
63 'git branch -m m m/m should work' \
64 'git-branch -l m &&
65 git-branch -m m m/m &&
66 test -f .git/logs/refs/heads/m/m'
67
68 test_expect_success \
69 'git branch -m n/n n should work' \
70 'git-branch -l n/n &&
71 git-branch -m n/n n
72 test -f .git/logs/refs/heads/n'
73
74 test_expect_failure \
75 'git branch -m o/o o should fail when o/p exists' \
76 'git-branch o/o &&
77 git-branch o/p &&
78 git-branch -m o/o o'
79
80 test_expect_failure \
81 'git branch -m q r/q should fail when r exists' \
82 'git-branch q &&
83 git-branch r &&
84 git-branch -m q r/q'
85
86 mv .git/config .git/config-saved
87
88 test_expect_success 'git branch -m q q2 without config should succeed' '
89 git-branch -m q q2 &&
90 git-branch -m q2 q
91 '
92
93 mv .git/config-saved .git/config
94
95 git-config branch.s/s.dummy Hello
96
97 test_expect_success \
98 'git branch -m s/s s should work when s/t is deleted' \
99 'git-branch -l s/s &&
100 test -f .git/logs/refs/heads/s/s &&
101 git-branch -l s/t &&
102 test -f .git/logs/refs/heads/s/t &&
103 git-branch -d s/t &&
104 git-branch -m s/s s &&
105 test -f .git/logs/refs/heads/s'
106
107 test_expect_success 'config information was renamed, too' \
108 "test $(git-config branch.s.dummy) = Hello &&
109 ! git-config branch.s/s/dummy"
110
111 test_expect_failure \
112 'git-branch -m u v should fail when the reflog for u is a symlink' \
113 'git-branch -l u &&
114 mv .git/logs/refs/heads/u real-u &&
115 ln -s real-u .git/logs/refs/heads/u &&
116 git-branch -m u v'
117
118 test_expect_success 'test tracking setup via --track' \
119 'git-config remote.local.url . &&
120 git-config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
121 (git-show-ref -q refs/remotes/local/master || git-fetch local) &&
122 git-branch --track my1 local/master &&
123 test $(git-config branch.my1.remote) = local &&
124 test $(git-config branch.my1.merge) = refs/heads/master'
125
126 test_expect_success 'test tracking setup (non-wildcard, matching)' \
127 'git-config remote.local.url . &&
128 git-config remote.local.fetch refs/heads/master:refs/remotes/local/master &&
129 (git-show-ref -q refs/remotes/local/master || git-fetch local) &&
130 git-branch --track my4 local/master &&
131 test $(git-config branch.my4.remote) = local &&
132 test $(git-config branch.my4.merge) = refs/heads/master'
133
134 test_expect_success 'test tracking setup (non-wildcard, not matching)' \
135 'git-config remote.local.url . &&
136 git-config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
137 (git-show-ref -q refs/remotes/local/master || git-fetch local) &&
138 git-branch --track my5 local/master &&
139 ! test "$(git-config branch.my5.remote)" = local &&
140 ! test "$(git-config branch.my5.merge)" = refs/heads/master'
141
142 test_expect_success 'test tracking setup via config' \
143 'git-config branch.autosetupmerge true &&
144 git-config remote.local.url . &&
145 git-config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
146 (git-show-ref -q refs/remotes/local/master || git-fetch local) &&
147 git-branch my3 local/master &&
148 test $(git-config branch.my3.remote) = local &&
149 test $(git-config branch.my3.merge) = refs/heads/master'
150
151 test_expect_success 'test overriding tracking setup via --no-track' \
152 'git-config branch.autosetupmerge true &&
153 git-config remote.local.url . &&
154 git-config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
155 (git-show-ref -q refs/remotes/local/master || git-fetch local) &&
156 git-branch --no-track my2 local/master &&
157 git-config branch.autosetupmerge false &&
158 ! test "$(git-config branch.my2.remote)" = local &&
159 ! test "$(git-config branch.my2.merge)" = refs/heads/master'
160
161 test_expect_success 'test local tracking setup' \
162 'git branch --track my6 s &&
163 test $(git-config branch.my6.remote) = . &&
164 test $(git-config branch.my6.merge) = refs/heads/s'
165
166 test_expect_success 'test tracking setup via --track but deeper' \
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/o/o || git-fetch local) &&
170 git-branch --track my7 local/o/o &&
171 test "$(git-config branch.my7.remote)" = local &&
172 test "$(git-config branch.my7.merge)" = refs/heads/o/o'
173
174 # Keep this test last, as it changes the current branch
175 cat >expect <<EOF
176 0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
177 EOF
178 test_expect_success \
179 'git checkout -b g/h/i -l should create a branch and a log' \
180 'GIT_COMMITTER_DATE="2005-05-26 23:30" \
181 git-checkout -b g/h/i -l master &&
182 test -f .git/refs/heads/g/h/i &&
183 test -f .git/logs/refs/heads/g/h/i &&
184 diff expect .git/logs/refs/heads/g/h/i'
185
186 test_done