summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
blob: 3f29594329a8f47302085962a8d58faf9e583ddf (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
#!/bin/sh
 
test_description='test cherry-pick and revert with conflicts
 
  -
  + picked: rewrites foo to c
  + base: rewrites foo to b
  + initial: writes foo as a, unrelated as unrelated
 
'
 
. ./test-lib.sh
 
test_expect_success setup '
 
	echo unrelated >unrelated &&
	git add unrelated &&
	test_commit initial foo a &&
	test_commit base foo b &&
	test_commit picked foo c &&
	git config advice.detachedhead false
 
'
 
test_expect_success 'failed cherry-pick does not advance HEAD' '
 
	git checkout -f initial^0 &&
	git read-tree -u --reset HEAD &&
	git clean -d -f -f -q -x &&
 
	git update-index --refresh &&
	git diff-index --exit-code HEAD &&
 
	head=$(git rev-parse HEAD) &&
	test_must_fail git cherry-pick picked &&
	newhead=$(git rev-parse HEAD) &&
 
	test "$head" = "$newhead"
'
 
test_expect_success 'advice from failed cherry-pick' '
	git checkout -f initial^0 &&
	git read-tree -u --reset HEAD &&
	git clean -d -f -f -q -x &&
 
	git update-index --refresh &&
	git diff-index --exit-code HEAD &&
 
	picked=$(git rev-parse --short picked) &&
	cat <<-EOF >expected &&
	error: could not apply $picked... picked
	hint: after resolving the conflicts, mark the corrected paths
	hint: with 'git add <paths>' or 'git rm <paths>'
	hint: and commit the result with 'git commit -c $picked'
	EOF
	test_must_fail git cherry-pick picked 2>actual &&
 
	test_cmp expected actual
'
 
test_expect_success 'failed cherry-pick produces dirty index' '
 
	git checkout -f initial^0 &&
	git read-tree -u --reset HEAD &&
	git clean -d -f -f -q -x &&
 
	git update-index --refresh &&
	git diff-index --exit-code HEAD &&
 
	test_must_fail git cherry-pick picked &&
 
	test_must_fail git update-index --refresh -q &&
	test_must_fail git diff-index --exit-code HEAD
'
 
test_expect_success 'failed cherry-pick registers participants in index' '
 
	git read-tree -u --reset HEAD &&
	git clean -d -f -f -q -x &&
	{
		git checkout base -- foo &&
		git ls-files --stage foo &&
		git checkout initial -- foo &&
		git ls-files --stage foo &&
		git checkout picked -- foo &&
		git ls-files --stage foo
	} > stages &&
	sed "
		1 s/ 0	/ 1	/
		2 s/ 0	/ 2	/
		3 s/ 0	/ 3	/
	" < stages > expected &&
	git checkout -f initial^0 &&
 
	git update-index --refresh &&
	git diff-index --exit-code HEAD &&
 
	test_must_fail git cherry-pick picked &&
	git ls-files --stage --unmerged > actual &&
 
	test_cmp expected actual
'
 
test_expect_success 'failed cherry-pick describes conflict in work tree' '
 
	git checkout -f initial^0 &&
	git read-tree -u --reset HEAD &&
	git clean -d -f -f -q -x &&
	cat <<-EOF > expected &&
	<<<<<<< HEAD
	a
	=======
	c
	>>>>>>> objid picked
	EOF
 
	git update-index --refresh &&
	git diff-index --exit-code HEAD &&
 
	test_must_fail git cherry-pick picked &&
 
	sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
	test_cmp expected actual
'
 
test_expect_success 'diff3 -m style' '
 
	git config merge.conflictstyle diff3 &&
	git checkout -f initial^0 &&
	git read-tree -u --reset HEAD &&
	git clean -d -f -f -q -x &&
	cat <<-EOF > expected &&
	<<<<<<< HEAD
	a
	||||||| parent of objid picked
	b
	=======
	c
	>>>>>>> objid picked
	EOF
 
	git update-index --refresh &&
	git diff-index --exit-code HEAD &&
 
	test_must_fail git cherry-pick picked &&
 
	sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
	test_cmp expected actual
'
 
test_expect_success 'revert also handles conflicts sanely' '
 
	git config --unset merge.conflictstyle &&
	git read-tree -u --reset HEAD &&
	git clean -d -f -f -q -x &&
	cat <<-EOF > expected &&
	<<<<<<< HEAD
	a
	=======
	b
	>>>>>>> parent of objid picked
	EOF
	{
		git checkout picked -- foo &&
		git ls-files --stage foo &&
		git checkout initial -- foo &&
		git ls-files --stage foo &&
		git checkout base -- foo &&
		git ls-files --stage foo
	} > stages &&
	sed "
		1 s/ 0	/ 1	/
		2 s/ 0	/ 2	/
		3 s/ 0	/ 3	/
	" < stages > expected-stages &&
	git checkout -f initial^0 &&
 
	git update-index --refresh &&
	git diff-index --exit-code HEAD &&
 
	head=$(git rev-parse HEAD) &&
	test_must_fail git revert picked &&
	newhead=$(git rev-parse HEAD) &&
	git ls-files --stage --unmerged > actual-stages &&
 
	test "$head" = "$newhead" &&
	test_must_fail git update-index --refresh -q &&
	test_must_fail git diff-index --exit-code HEAD &&
	test_cmp expected-stages actual-stages &&
	sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
	test_cmp expected actual
'
 
test_expect_success 'revert conflict, diff3 -m style' '
	git config merge.conflictstyle diff3 &&
	git checkout -f initial^0 &&
	git read-tree -u --reset HEAD &&
	git clean -d -f -f -q -x &&
	cat <<-EOF > expected &&
	<<<<<<< HEAD
	a
	||||||| objid picked
	c
	=======
	b
	>>>>>>> parent of objid picked
	EOF
 
	git update-index --refresh &&
	git diff-index --exit-code HEAD &&
 
	test_must_fail git revert picked &&
 
	sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
	test_cmp expected actual
'
 
test_done