]>
Commit | Line | Data |
---|---|---|
a3b427b9 AW |
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 \ | |
4c84f0dc | 14 | 'prepare a trivial repository' \ |
a3b427b9 | 15 | 'echo Hello > A && |
5be60078 | 16 | git update-index --add A && |
d7fb7a37 | 17 | git-commit -m "Initial commit." && |
9ed36cfa JS |
18 | echo World >> A && |
19 | git update-index --add A && | |
20 | git-commit -m "Second commit." && | |
5be60078 | 21 | HEAD=$(git rev-parse --verify HEAD)' |
a3b427b9 | 22 | |
41ac414e JH |
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 | |
27 | ' | |
a3b427b9 | 28 | |
08db81a9 AR |
29 | test_expect_success \ |
30 | 'git branch abc should create a branch' \ | |
5be60078 | 31 | 'git branch abc && test -f .git/refs/heads/abc' |
08db81a9 AR |
32 | |
33 | test_expect_success \ | |
34 | 'git branch a/b/c should create a branch' \ | |
5be60078 | 35 | 'git branch a/b/c && test -f .git/refs/heads/a/b/c' |
08db81a9 | 36 | |
d7fb7a37 | 37 | cat >expect <<EOF |
5d9e8ee7 | 38 | 0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master |
d7fb7a37 SP |
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" \ | |
5be60078 | 43 | git branch -l d/e/f && |
d7fb7a37 SP |
44 | test -f .git/refs/heads/d/e/f && |
45 | test -f .git/logs/refs/heads/d/e/f && | |
46 | diff expect .git/logs/refs/heads/d/e/f' | |
47 | ||
48 | test_expect_success \ | |
49 | 'git branch -d d/e/f should delete a branch and a log' \ | |
5be60078 | 50 | 'git branch -d d/e/f && |
d7fb7a37 SP |
51 | test ! -f .git/refs/heads/d/e/f && |
52 | test ! -f .git/logs/refs/heads/d/e/f' | |
53 | ||
9c7b0b3f CC |
54 | test_expect_success \ |
55 | 'git branch j/k should work after branch j has been deleted' \ | |
5be60078 JH |
56 | 'git branch j && |
57 | git branch -d j && | |
58 | git branch j/k' | |
9c7b0b3f CC |
59 | |
60 | test_expect_success \ | |
61 | 'git branch l should work after branch l/m has been deleted' \ | |
5be60078 JH |
62 | 'git branch l/m && |
63 | git branch -d l/m && | |
64 | git branch l' | |
9c7b0b3f | 65 | |
c976d415 LH |
66 | test_expect_success \ |
67 | 'git branch -m m m/m should work' \ | |
5be60078 JH |
68 | 'git branch -l m && |
69 | git branch -m m m/m && | |
c976d415 LH |
70 | test -f .git/logs/refs/heads/m/m' |
71 | ||
72 | test_expect_success \ | |
73 | 'git branch -m n/n n should work' \ | |
5be60078 JH |
74 | 'git branch -l n/n && |
75 | git branch -m n/n n | |
c976d415 LH |
76 | test -f .git/logs/refs/heads/n' |
77 | ||
41ac414e JH |
78 | test_expect_success 'git branch -m o/o o should fail when o/p exists' ' |
79 | git branch o/o && | |
5be60078 | 80 | git branch o/p && |
41ac414e JH |
81 | ! git branch -m o/o o |
82 | ' | |
c976d415 | 83 | |
41ac414e JH |
84 | test_expect_success 'git branch -m q r/q should fail when r exists' ' |
85 | git branch q && | |
86 | git branch r && | |
87 | ! git branch -m q r/q | |
88 | ' | |
c976d415 | 89 | |
01ebb9dc GB |
90 | mv .git/config .git/config-saved |
91 | ||
08b984fb | 92 | test_expect_success 'git branch -m q q2 without config should succeed' ' |
5be60078 JH |
93 | git branch -m q q2 && |
94 | git branch -m q2 q | |
01ebb9dc GB |
95 | ' |
96 | ||
97 | mv .git/config-saved .git/config | |
98 | ||
5be60078 | 99 | git config branch.s/s.dummy Hello |
dc81c58c | 100 | |
c976d415 LH |
101 | test_expect_success \ |
102 | 'git branch -m s/s s should work when s/t is deleted' \ | |
5be60078 | 103 | 'git branch -l s/s && |
c976d415 | 104 | test -f .git/logs/refs/heads/s/s && |
5be60078 | 105 | git branch -l s/t && |
c976d415 | 106 | test -f .git/logs/refs/heads/s/t && |
5be60078 JH |
107 | git branch -d s/t && |
108 | git branch -m s/s s && | |
c976d415 LH |
109 | test -f .git/logs/refs/heads/s' |
110 | ||
dc81c58c | 111 | test_expect_success 'config information was renamed, too' \ |
5be60078 JH |
112 | "test $(git config branch.s.dummy) = Hello && |
113 | ! git config branch.s/s/dummy" | |
dc81c58c | 114 | |
41ac414e JH |
115 | test_expect_success \ |
116 | 'git branch -m u v should fail when the reflog for u is a symlink' ' | |
117 | git branch -l u && | |
16c2bfbb LH |
118 | mv .git/logs/refs/heads/u real-u && |
119 | ln -s real-u .git/logs/refs/heads/u && | |
41ac414e JH |
120 | ! git branch -m u v |
121 | ' | |
16c2bfbb | 122 | |
0746d19a | 123 | test_expect_success 'test tracking setup via --track' \ |
5be60078 JH |
124 | 'git config remote.local.url . && |
125 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
126 | (git show-ref -q refs/remotes/local/master || git-fetch local) && | |
127 | git branch --track my1 local/master && | |
128 | test $(git config branch.my1.remote) = local && | |
129 | test $(git config branch.my1.merge) = refs/heads/master' | |
0746d19a PB |
130 | |
131 | test_expect_success 'test tracking setup (non-wildcard, matching)' \ | |
5be60078 JH |
132 | 'git config remote.local.url . && |
133 | git config remote.local.fetch refs/heads/master:refs/remotes/local/master && | |
134 | (git show-ref -q refs/remotes/local/master || git-fetch local) && | |
135 | git branch --track my4 local/master && | |
136 | test $(git config branch.my4.remote) = local && | |
137 | test $(git config branch.my4.merge) = refs/heads/master' | |
0746d19a PB |
138 | |
139 | test_expect_success 'test tracking setup (non-wildcard, not matching)' \ | |
5be60078 JH |
140 | 'git config remote.local.url . && |
141 | git config remote.local.fetch refs/heads/s:refs/remotes/local/s && | |
142 | (git show-ref -q refs/remotes/local/master || git-fetch local) && | |
143 | git branch --track my5 local/master && | |
144 | ! test "$(git config branch.my5.remote)" = local && | |
145 | ! test "$(git config branch.my5.merge)" = refs/heads/master' | |
0746d19a PB |
146 | |
147 | test_expect_success 'test tracking setup via config' \ | |
5be60078 JH |
148 | 'git config branch.autosetupmerge true && |
149 | git config remote.local.url . && | |
150 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
151 | (git show-ref -q refs/remotes/local/master || git-fetch local) && | |
152 | git branch my3 local/master && | |
153 | test $(git config branch.my3.remote) = local && | |
154 | test $(git config branch.my3.merge) = refs/heads/master' | |
0746d19a | 155 | |
6f084a56 | 156 | test_expect_success 'avoid ambiguous track' ' |
4017761f | 157 | git config branch.autosetupmerge true && |
6f084a56 JS |
158 | git config remote.ambi1.url = lalala && |
159 | git config remote.ambi1.fetch = refs/heads/lalala:refs/heads/master && | |
160 | git config remote.ambi2.url = lilili && | |
161 | git config remote.ambi2.fetch = refs/heads/lilili:refs/heads/master && | |
4017761f | 162 | git branch all1 master && |
6f084a56 | 163 | test -z "$(git config branch.all1.merge)" |
4017761f JS |
164 | ' |
165 | ||
0746d19a | 166 | test_expect_success 'test overriding tracking setup via --no-track' \ |
5be60078 JH |
167 | 'git config branch.autosetupmerge true && |
168 | git config remote.local.url . && | |
169 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
170 | (git show-ref -q refs/remotes/local/master || git-fetch local) && | |
171 | git branch --no-track my2 local/master && | |
172 | git config branch.autosetupmerge false && | |
173 | ! test "$(git config branch.my2.remote)" = local && | |
174 | ! test "$(git config branch.my2.merge)" = refs/heads/master' | |
0746d19a | 175 | |
6f084a56 | 176 | test_expect_success 'no tracking without .fetch entries' \ |
9ed36cfa JS |
177 | 'git config branch.autosetupmerge true && |
178 | git branch my6 s && | |
179 | git config branch.automsetupmerge false && | |
6f084a56 JS |
180 | test -z "$(git config branch.my6.remote)" && |
181 | test -z "$(git config branch.my6.merge)"' | |
9debc324 | 182 | |
11f68d90 | 183 | test_expect_success 'test tracking setup via --track but deeper' \ |
5be60078 JH |
184 | 'git config remote.local.url . && |
185 | git config remote.local.fetch refs/heads/*:refs/remotes/local/* && | |
186 | (git show-ref -q refs/remotes/local/o/o || git-fetch local) && | |
187 | git branch --track my7 local/o/o && | |
188 | test "$(git config branch.my7.remote)" = local && | |
189 | test "$(git config branch.my7.merge)" = refs/heads/o/o' | |
11f68d90 | 190 | |
f1eccbab | 191 | test_expect_success 'test deleting branch deletes branch config' \ |
5be60078 | 192 | 'git branch -d my7 && |
6f084a56 JS |
193 | test -z "$(git config branch.my7.remote)" && |
194 | test -z "$(git config branch.my7.merge)"' | |
f1eccbab GP |
195 | |
196 | test_expect_success 'test deleting branch without config' \ | |
5be60078 JH |
197 | 'git branch my7 s && |
198 | test "$(git branch -d my7 2>&1)" = "Deleted branch my7."' | |
f1eccbab | 199 | |
9ed36cfa JS |
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)"' | |
204 | ||
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' | |
210 | ||
211 | test_expect_success \ | |
212 | 'branch from non-branch HEAD w/--track causes failure' \ | |
213 | '!(git branch --track my10 HEAD^)' | |
214 | ||
0746d19a PB |
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 | |
218 | EOF | |
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 | diff expect .git/logs/refs/heads/g/h/i' | |
226 | ||
a3b427b9 | 227 | test_done |