blob: 20a3ffed6911e3f97427437d861273f33c64051a (
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
|
#!/bin/sh
test_description="merges with unrelated index changes"
. ./test-lib.sh
# Testcase for some simple merges
# A
# o-----o B
# \
# \---o C
# \
# \-o D
# \
# o E
# Commit A: some file a
# Commit B: adds file b, modifies end of a
# Commit C: adds file c
# Commit D: adds file d, modifies beginning of a
# Commit E: renames a->subdir/a, adds subdir/e
test_expect_success 'setup trivial merges' '
seq 1 10 >a &&
git add a &&
test_tick && git commit -m A &&
git branch A &&
git branch B &&
git branch C &&
git branch D &&
git branch E &&
git checkout B &&
echo b >b &&
echo 11 >>a &&
git add a b &&
test_tick && git commit -m B &&
git checkout C &&
echo c >c &&
git add c &&
test_tick && git commit -m C &&
git checkout D &&
seq 2 10 >a &&
echo d >d &&
git add a d &&
test_tick && git commit -m D &&
git checkout E &&
mkdir subdir &&
git mv a subdir/a &&
echo e >subdir/e &&
git add subdir &&
test_tick && git commit -m E
'
test_expect_success 'ff update' '
git reset --hard &&
git checkout A^0 &&
touch random_file && git add random_file &&
git merge E^0 &&
test_must_fail git rev-parse HEAD:random_file &&
test "$(git diff --name-only --cached E)" = "random_file"
'
test_expect_success 'ff update, important file modified' '
git reset --hard &&
git checkout A^0 &&
mkdir subdir &&
touch subdir/e &&
git add subdir/e &&
test_must_fail git merge E^0
'
test_expect_success 'resolve, trivial' '
git reset --hard &&
git checkout B^0 &&
touch random_file && git add random_file &&
test_must_fail git merge -s resolve C^0
'
test_expect_success 'resolve, non-trivial' '
git reset --hard &&
git checkout B^0 &&
touch random_file && git add random_file &&
test_must_fail git merge -s resolve D^0
'
test_expect_success 'recursive' '
git reset --hard &&
git checkout B^0 &&
touch random_file && git add random_file &&
test_must_fail git merge -s recursive C^0
'
test_expect_success 'octopus, unrelated file touched' '
git reset --hard &&
git checkout B^0 &&
touch random_file && git add random_file &&
test_must_fail git merge C^0 D^0
'
test_expect_success 'octopus, related file removed' '
git reset --hard &&
git checkout B^0 &&
git rm b &&
test_must_fail git merge C^0 D^0
'
test_expect_success 'octopus, related file modified' '
git reset --hard &&
git checkout B^0 &&
echo 12 >>a && git add a &&
test_must_fail git merge C^0 D^0
'
test_expect_success 'ours' '
git reset --hard &&
git checkout B^0 &&
touch random_file && git add random_file &&
test_must_fail git merge -s ours C^0
'
test_expect_success 'subtree' '
git reset --hard &&
git checkout B^0 &&
touch random_file && git add random_file &&
test_must_fail git merge -s subtree E^0
'
test_done
|
