blob: 114d2bd7855f71ec1d48f2017438f897c5255d36 (
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
|
#!/bin/sh
test_description='unpack-trees error messages'
. ./test-lib.sh
test_expect_success 'setup' '
echo one >one &&
git add one &&
git commit -a -m First &&
git checkout -b branch &&
echo two >two &&
echo three >three &&
echo four >four &&
echo five >five &&
git add two three four five &&
git commit -m Second &&
git checkout master &&
echo other >two &&
echo other >three &&
echo other >four &&
echo other >five
'
cat >expect <<\EOF
error: The following untracked working tree files would be overwritten by merge:
two
three
four
five
Please move or remove them before you can merge.
EOF
test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' '
test_must_fail git merge branch 2>out &&
test_cmp out expect &&
git commit --allow-empty -m empty &&
(
GIT_MERGE_VERBOSITY=0 &&
export GIT_MERGE_VERBOSITY &&
test_must_fail git merge branch 2>out2
) &&
test_cmp out2 expect &&
git reset --hard HEAD^
'
cat >expect <<\EOF
error: Your local changes to the following files would be overwritten by merge:
two
three
four
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
five
Please move or remove them before you can merge.
EOF
test_expect_success 'untracked files or local changes ovewritten by merge' '
git add two &&
git add three &&
git add four &&
test_must_fail git merge branch 2>out &&
test_cmp out expect
'
cat >expect <<\EOF
error: Your local changes to the following files would be overwritten by checkout:
rep/two
rep/one
Please, commit your changes or stash them before you can switch branches.
EOF
test_expect_success 'cannot switch branches because of local changes' '
git add five &&
mkdir rep &&
echo one >rep/one &&
echo two >rep/two &&
git add rep/one rep/two &&
git commit -m Fourth &&
git checkout master &&
echo uno >rep/one &&
echo dos >rep/two &&
test_must_fail git checkout branch 2>out &&
test_cmp out expect
'
cat >expect <<\EOF
error: Your local changes to the following files would be overwritten by checkout:
rep/two
rep/one
Please, commit your changes or stash them before you can switch branches.
EOF
test_expect_success 'not uptodate file porcelain checkout error' '
git add rep/one rep/two &&
test_must_fail git checkout branch 2>out &&
test_cmp out expect
'
cat >expect <<\EOF
error: Updating the following directories would lose untracked files in it:
rep2
rep
EOF
test_expect_success 'not_uptodate_dir porcelain checkout error' '
git init uptodate &&
cd uptodate &&
mkdir rep &&
mkdir rep2 &&
touch rep/foo &&
touch rep2/foo &&
git add rep/foo rep2/foo &&
git commit -m init &&
git checkout -b branch &&
git rm rep -r &&
git rm rep2 -r &&
>rep &&
>rep2 &&
git add rep rep2&&
git commit -m "added test as a file" &&
git checkout master &&
>rep/untracked-file &&
>rep2/untracked-file &&
test_must_fail git checkout branch 2>out &&
test_cmp out ../expect
'
test_done
|
