summaryrefslogtreecommitdiff
path: root/t/t7201-co.sh
blob: 724adef0bfdc1f9028f112451c76d9053b60223f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
#!/bin/sh
#
# Copyright (c) 2006 Junio C Hamano
#
 
test_description='git-checkout tests.
 
Creates master, forks renamer and side branches from it.
Test switching across them.
 
  ! [master] Initial A one, A two
   * [renamer] Renamer R one->uno, M two
    ! [side] Side M one, D two, A three
  ---
    + [side] Side M one, D two, A three
   *  [renamer] Renamer R one->uno, M two
  +*+ [master] Initial A one, A two
 
'
 
. ./test-lib.sh
 
test_tick
 
fill () {
	for i
	do
		echo "$i"
	done
}
 
 
test_expect_success setup '
 
	fill x y z > same &&
	fill 1 2 3 4 5 6 7 8 >one &&
	fill a b c d e >two &&
	git add same one two &&
	git commit -m "Initial A one, A two" &&
 
	git checkout -b renamer &&
	rm -f one &&
	fill 1 3 4 5 6 7 8 >uno &&
	git add uno &&
	fill a b c d e f >two &&
	git commit -a -m "Renamer R one->uno, M two" &&
 
	git checkout -b side master &&
	fill 1 2 3 4 5 6 7 >one &&
	fill A B C D E >three &&
	rm -f two &&
	git update-index --add --remove one two three &&
	git commit -m "Side M one, D two, A three" &&
 
	git checkout master
'
 
test_expect_success "checkout from non-existing branch" '
 
	git checkout -b delete-me master &&
	rm .git/refs/heads/delete-me &&
	test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
	git checkout master &&
	test refs/heads/master = "$(git symbolic-ref HEAD)"
'
 
test_expect_success "checkout with dirty tree without -m" '
 
	fill 0 1 2 3 4 5 6 7 8 >one &&
	if git checkout side
	then
		echo Not happy
		false
	else
		echo "happy - failed correctly"
	fi
 
'
 
test_expect_success "checkout with unrelated dirty tree without -m" '
 
	git checkout -f master &&
	fill 0 1 2 3 4 5 6 7 8 >same &&
	cp same kept
	git checkout side >messages &&
	diff -u same kept
	(cat > messages.expect <<EOF
M	same
EOF
) &&
	touch messages.expect &&
	diff -u messages.expect messages
'
 
test_expect_success "checkout -m with dirty tree" '
 
	git checkout -f master &&
	git clean -f &&
 
	fill 0 1 2 3 4 5 6 7 8 >one &&
	git checkout -m side > messages &&
 
	test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
 
	(cat >expect.messages <<EOF
M	one
EOF
) &&
	diff -u expect.messages messages &&
 
	fill "M	one" "A	three" "D	two" >expect.master &&
	git diff --name-status master >current.master &&
	diff -u expect.master current.master &&
 
	fill "M	one" >expect.side &&
	git diff --name-status side >current.side &&
	diff -u expect.side current.side &&
 
	: >expect.index &&
	git diff --cached >current.index &&
	diff -u expect.index current.index
'
 
test_expect_success "checkout -m with dirty tree, renamed" '
 
	git checkout -f master && git clean -f &&
 
	fill 1 2 3 4 5 7 8 >one &&
	if git checkout renamer
	then
		echo Not happy
		false
	else
		echo "happy - failed correctly"
	fi &&
 
	git checkout -m renamer &&
	fill 1 3 4 5 7 8 >expect &&
	diff -u expect uno &&
	! test -f one &&
	git diff --cached >current &&
	! test -s current
 
'
 
test_expect_success 'checkout -m with merge conflict' '
 
	git checkout -f master && git clean -f &&
 
	fill 1 T 3 4 5 6 S 8 >one &&
	if git checkout renamer
	then
		echo Not happy
		false
	else
		echo "happy - failed correctly"
	fi &&
 
	git checkout -m renamer &&
 
	git diff master:one :3:uno |
	sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
	fill d2 aT d7 aS >expect &&
	diff -u current expect &&
	git diff --cached two >current &&
	! test -s current
'
 
test_expect_success 'checkout to detach HEAD' '
 
	git checkout -f renamer && git clean -f &&
	git checkout renamer^ 2>messages &&
	(cat >messages.expect <<EOF
Note: moving to "renamer^" which isn'"'"'t a local branch
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
  git checkout -b <new_branch_name>
HEAD is now at 7329388... Initial A one, A two
EOF
) &&
	diff -u messages.expect messages &&
	H=$(git rev-parse --verify HEAD) &&
	M=$(git show-ref -s --verify refs/heads/master) &&
	test "z$H" = "z$M" &&
	if git symbolic-ref HEAD >/dev/null 2>&1
	then
		echo "OOPS, HEAD is still symbolic???"
		false
	else
		: happy
	fi
'
 
test_expect_success 'checkout to detach HEAD with branchname^' '
 
	git checkout -f master && git clean -f &&
	git checkout renamer^ &&
	H=$(git rev-parse --verify HEAD) &&
	M=$(git show-ref -s --verify refs/heads/master) &&
	test "z$H" = "z$M" &&
	if git symbolic-ref HEAD >/dev/null 2>&1
	then
		echo "OOPS, HEAD is still symbolic???"
		false
	else
		: happy
	fi
'
 
test_expect_success 'checkout to detach HEAD with :/message' '
 
	git checkout -f master && git clean -f &&
	git checkout ":/Initial" &&
	H=$(git rev-parse --verify HEAD) &&
	M=$(git show-ref -s --verify refs/heads/master) &&
	test "z$H" = "z$M" &&
	if git symbolic-ref HEAD >/dev/null 2>&1
	then
		echo "OOPS, HEAD is still symbolic???"
		false
	else
		: happy
	fi
'
 
test_expect_success 'checkout to detach HEAD with HEAD^0' '
 
	git checkout -f master && git clean -f &&
	git checkout HEAD^0 &&
	H=$(git rev-parse --verify HEAD) &&
	M=$(git show-ref -s --verify refs/heads/master) &&
	test "z$H" = "z$M" &&
	if git symbolic-ref HEAD >/dev/null 2>&1
	then
		echo "OOPS, HEAD is still symbolic???"
		false
	else
		: happy
	fi
'
 
test_expect_success 'checkout with ambiguous tag/branch names' '
 
	git tag both side &&
	git branch both master &&
	git reset --hard &&
	git checkout master &&
 
	git checkout both &&
	H=$(git rev-parse --verify HEAD) &&
	M=$(git show-ref -s --verify refs/heads/master) &&
	test "z$H" = "z$M" &&
	name=$(git symbolic-ref HEAD 2>/dev/null) &&
	test "z$name" = zrefs/heads/both
 
'
 
test_expect_success 'checkout with ambiguous tag/branch names' '
 
	git reset --hard &&
	git checkout master &&
 
	git tag frotz side &&
	git branch frotz master &&
	git reset --hard &&
	git checkout master &&
 
	git checkout tags/frotz &&
	H=$(git rev-parse --verify HEAD) &&
	S=$(git show-ref -s --verify refs/heads/side) &&
	test "z$H" = "z$S" &&
	if name=$(git symbolic-ref HEAD 2>/dev/null)
	then
		echo "Bad -- should have detached"
		false
	else
		: happy
	fi
 
'
 
test_expect_success 'switch branches while in subdirectory' '
 
	git reset --hard &&
	git checkout master &&
 
	mkdir subs &&
	(
		cd subs &&
		git checkout side
	) &&
	! test -f subs/one &&
	rm -fr subs
 
'
 
test_expect_success 'checkout specific path while in subdirectory' '
 
	git reset --hard &&
	git checkout side &&
	mkdir subs &&
	>subs/bero &&
	git add subs/bero &&
	git commit -m "add subs/bero" &&
 
	git checkout master &&
	mkdir -p subs &&
	(
		cd subs &&
		git checkout side -- bero
	) &&
	test -f subs/bero
 
'
 
test_done