blob: b64e8b7d773f9503c7a5b0e80945be60f71e345f (
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
|
#!/bin/sh
#
# Copyright (c) 2006 Junio C Hamano
#
test_description='git-checkout tests.'
. ./test-lib.sh
fill () {
for i
do
echo "$i"
done
}
test_expect_success setup '
fill 1 2 3 4 5 >one &&
fill a b c d e >two &&
git add one two &&
git commit -m "Initial A one, A two" &&
git checkout -b side &&
fill 1 2 3 >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 with dirty tree without -m" '
fill 0 1 2 3 4 5 >one &&
if git checkout side
then
echo Not happy
false
else
echo "happy - failed correctly"
fi
'
test_expect_success "checkout -m with dirty tree" '
git checkout -f master &&
git clean &&
fill 0 1 2 3 4 5 >one &&
git checkout -m side &&
fill " master" "* side" >expect.branch &&
git branch >current.branch &&
diff expect.branch current.branch &&
fill "M one" "A three" "D two" >expect.master &&
git diff --name-status master >current.master &&
diff expect.master current.master &&
fill "M one" >expect.side &&
git diff --name-status side >current.side &&
diff expect.side current.side &&
: >expect.index &&
git diff --cached >current.index &&
diff expect.index current.index
'
test_done
|
