3 f259c4c1 2021-09-24 stsp # Copyright (c) 2021 Stefan Sperling <stsp@openbsd.org>
5 f259c4c1 2021-09-24 stsp # Permission to use, copy, modify, and distribute this software for any
6 f259c4c1 2021-09-24 stsp # purpose with or without fee is hereby granted, provided that the above
7 f259c4c1 2021-09-24 stsp # copyright notice and this permission notice appear in all copies.
9 f259c4c1 2021-09-24 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 f259c4c1 2021-09-24 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 f259c4c1 2021-09-24 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 f259c4c1 2021-09-24 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 f259c4c1 2021-09-24 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 f259c4c1 2021-09-24 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 f259c4c1 2021-09-24 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 f259c4c1 2021-09-24 stsp . ./common.sh
19 f259c4c1 2021-09-24 stsp test_merge_basic() {
20 f259c4c1 2021-09-24 stsp local testroot=`test_init merge_basic`
21 f259c4c1 2021-09-24 stsp local commit0=`git_show_head $testroot/repo`
22 f259c4c1 2021-09-24 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
24 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q -b newbranch)
25 f259c4c1 2021-09-24 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
26 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
27 f259c4c1 2021-09-24 stsp local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
29 f259c4c1 2021-09-24 stsp echo "modified alpha on branch" > $testroot/repo/alpha
30 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
31 f259c4c1 2021-09-24 stsp local branch_commit1=`git_show_branch_head $testroot/repo newbranch`
32 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git rm -q beta)
33 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "removing beta on newbranch"
34 f259c4c1 2021-09-24 stsp local branch_commit2=`git_show_branch_head $testroot/repo newbranch`
35 f259c4c1 2021-09-24 stsp echo "new file on branch" > $testroot/repo/epsilon/new
36 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git add epsilon/new)
37 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "adding new file on newbranch"
38 f259c4c1 2021-09-24 stsp local branch_commit3=`git_show_branch_head $testroot/repo newbranch`
39 f259c4c1 2021-09-24 stsp (cd $testroot/repo && ln -s alpha symlink && git add symlink)
40 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "adding symlink on newbranch"
41 f259c4c1 2021-09-24 stsp local branch_commit4=`git_show_branch_head $testroot/repo newbranch`
42 5267b9e4 2021-09-26 stsp (cd $testroot/repo && ln -sf .got/bar dotgotbar.link)
43 5267b9e4 2021-09-26 stsp (cd $testroot/repo && git add dotgotbar.link)
44 5267b9e4 2021-09-26 stsp git_commit $testroot/repo -m "adding a bad symlink on newbranch"
45 5267b9e4 2021-09-26 stsp local branch_commit5=`git_show_branch_head $testroot/repo newbranch`
47 f259c4c1 2021-09-24 stsp got checkout -b master $testroot/repo $testroot/wt > /dev/null
49 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
50 f259c4c1 2021-09-24 stsp echo "got checkout failed unexpectedly" >&2
51 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
55 179f9db0 2023-06-20 falsifian # create a divergent commit
56 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q master)
57 f259c4c1 2021-09-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
58 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
59 f259c4c1 2021-09-24 stsp local master_commit=`git_show_head $testroot/repo`
61 5e91dae4 2022-08-30 stsp # need an up-to-date work tree for 'got merge'
62 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge newbranch \
63 f259c4c1 2021-09-24 stsp > $testroot/stdout 2> $testroot/stderr)
65 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
66 f259c4c1 2021-09-24 stsp echo "got merge succeeded unexpectedly" >&2
67 ea4ee74a 2023-06-17 op test_done "$testroot" "1"
70 f259c4c1 2021-09-24 stsp echo -n "got: work tree must be updated before it can be used " \
71 f259c4c1 2021-09-24 stsp > $testroot/stderr.expected
72 f259c4c1 2021-09-24 stsp echo "to merge a branch" >> $testroot/stderr.expected
73 f259c4c1 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
75 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
76 f259c4c1 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
77 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
81 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got update > /dev/null)
83 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
84 f259c4c1 2021-09-24 stsp echo "got update failed unexpectedly" >&2
85 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
89 5e91dae4 2022-08-30 stsp # must not use a mixed-commit work tree with 'got merge'
90 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got update -c $commit0 alpha > /dev/null)
92 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
93 f259c4c1 2021-09-24 stsp echo "got update failed unexpectedly" >&2
94 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
97 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge newbranch \
98 f259c4c1 2021-09-24 stsp > $testroot/stdout 2> $testroot/stderr)
100 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
101 f259c4c1 2021-09-24 stsp echo "got merge succeeded unexpectedly" >&2
102 ea4ee74a 2023-06-17 op test_done "$testroot" "1"
105 f259c4c1 2021-09-24 stsp echo -n "got: work tree contains files from multiple base commits; " \
106 f259c4c1 2021-09-24 stsp > $testroot/stderr.expected
107 f259c4c1 2021-09-24 stsp echo "the entire work tree must be updated first" \
108 f259c4c1 2021-09-24 stsp >> $testroot/stderr.expected
109 f259c4c1 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
111 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
112 f259c4c1 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
113 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
117 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got update > /dev/null)
119 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
120 f259c4c1 2021-09-24 stsp echo "got update failed unexpectedly" >&2
121 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
125 5e91dae4 2022-08-30 stsp # must not have staged files with 'got merge'
126 f259c4c1 2021-09-24 stsp echo "modified file alpha" > $testroot/wt/alpha
127 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got stage alpha > /dev/null)
129 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
130 f259c4c1 2021-09-24 stsp echo "got stage failed unexpectedly" >&2
131 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
134 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge newbranch \
135 f259c4c1 2021-09-24 stsp > $testroot/stdout 2> $testroot/stderr)
137 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
138 f259c4c1 2021-09-24 stsp echo "got merge succeeded unexpectedly" >&2
139 ea4ee74a 2023-06-17 op test_done "$testroot" "1"
142 f259c4c1 2021-09-24 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
143 f259c4c1 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
145 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
146 f259c4c1 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
147 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
150 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got unstage alpha > /dev/null)
152 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
153 f259c4c1 2021-09-24 stsp echo "got unstage failed unexpectedly" >&2
154 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
158 5e91dae4 2022-08-30 stsp # must not have local changes with 'got merge'
159 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge newbranch \
160 f259c4c1 2021-09-24 stsp > $testroot/stdout 2> $testroot/stderr)
162 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
163 f259c4c1 2021-09-24 stsp echo "got merge succeeded unexpectedly" >&2
164 ea4ee74a 2023-06-17 op test_done "$testroot" "1"
167 f259c4c1 2021-09-24 stsp echo -n "got: work tree contains local changes; " \
168 f259c4c1 2021-09-24 stsp > $testroot/stderr.expected
169 f259c4c1 2021-09-24 stsp echo "these changes must be committed or reverted first" \
170 f259c4c1 2021-09-24 stsp >> $testroot/stderr.expected
171 f259c4c1 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
173 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
174 f259c4c1 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
175 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
179 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got revert alpha > /dev/null)
181 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
182 f259c4c1 2021-09-24 stsp echo "got revert failed unexpectedly" >&2
183 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
187 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge newbranch > $testroot/stdout)
189 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
190 f259c4c1 2021-09-24 stsp echo "got merge failed unexpectedly" >&2
191 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
195 f259c4c1 2021-09-24 stsp local merge_commit=`git_show_head $testroot/repo`
197 f259c4c1 2021-09-24 stsp echo "G alpha" >> $testroot/stdout.expected
198 f259c4c1 2021-09-24 stsp echo "D beta" >> $testroot/stdout.expected
199 5267b9e4 2021-09-26 stsp echo "A dotgotbar.link" >> $testroot/stdout.expected
200 f259c4c1 2021-09-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
201 f259c4c1 2021-09-24 stsp echo "G gamma/delta" >> $testroot/stdout.expected
202 f259c4c1 2021-09-24 stsp echo "A symlink" >> $testroot/stdout.expected
203 f259c4c1 2021-09-24 stsp echo -n "Merged refs/heads/newbranch into refs/heads/master: " \
204 f259c4c1 2021-09-24 stsp >> $testroot/stdout.expected
205 f259c4c1 2021-09-24 stsp echo $merge_commit >> $testroot/stdout.expected
207 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
209 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
210 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
211 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
215 f259c4c1 2021-09-24 stsp echo "modified delta on branch" > $testroot/content.expected
216 f259c4c1 2021-09-24 stsp cat $testroot/wt/gamma/delta > $testroot/content
217 f259c4c1 2021-09-24 stsp cmp -s $testroot/content.expected $testroot/content
219 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
220 f259c4c1 2021-09-24 stsp diff -u $testroot/content.expected $testroot/content
221 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
225 f259c4c1 2021-09-24 stsp echo "modified alpha on branch" > $testroot/content.expected
226 f259c4c1 2021-09-24 stsp cat $testroot/wt/alpha > $testroot/content
227 f259c4c1 2021-09-24 stsp cmp -s $testroot/content.expected $testroot/content
229 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
230 f259c4c1 2021-09-24 stsp diff -u $testroot/content.expected $testroot/content
231 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
235 f259c4c1 2021-09-24 stsp if [ -e $testroot/wt/beta ]; then
236 f259c4c1 2021-09-24 stsp echo "removed file beta still exists on disk" >&2
237 f259c4c1 2021-09-24 stsp test_done "$testroot" "1"
241 f259c4c1 2021-09-24 stsp echo "new file on branch" > $testroot/content.expected
242 f259c4c1 2021-09-24 stsp cat $testroot/wt/epsilon/new > $testroot/content
243 f259c4c1 2021-09-24 stsp cmp -s $testroot/content.expected $testroot/content
245 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
246 f259c4c1 2021-09-24 stsp diff -u $testroot/content.expected $testroot/content
247 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
251 5267b9e4 2021-09-26 stsp if [ ! -h $testroot/wt/dotgotbar.link ]; then
252 5267b9e4 2021-09-26 stsp echo "dotgotbar.link is not a symlink"
253 5267b9e4 2021-09-26 stsp test_done "$testroot" "1"
257 f259c4c1 2021-09-24 stsp readlink $testroot/wt/symlink > $testroot/stdout
258 f259c4c1 2021-09-24 stsp echo "alpha" > $testroot/stdout.expected
259 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
261 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
262 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
263 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
267 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
269 f259c4c1 2021-09-24 stsp echo -n > $testroot/stdout.expected
270 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
272 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
273 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
274 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
278 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
279 f259c4c1 2021-09-24 stsp echo "commit $merge_commit (master)" > $testroot/stdout.expected
280 f259c4c1 2021-09-24 stsp echo "commit $master_commit" >> $testroot/stdout.expected
281 f259c4c1 2021-09-24 stsp echo "commit $commit0" >> $testroot/stdout.expected
282 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
284 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
285 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
286 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
290 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got update > $testroot/stdout)
292 5267b9e4 2021-09-26 stsp echo 'U dotgotbar.link' > $testroot/stdout.expected
293 5267b9e4 2021-09-26 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
294 5267b9e4 2021-09-26 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
295 5267b9e4 2021-09-26 stsp echo >> $testroot/stdout.expected
296 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
298 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
299 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
300 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
304 5267b9e4 2021-09-26 stsp # update has changed the bad symlink into a regular file
305 5267b9e4 2021-09-26 stsp if [ -h $testroot/wt/dotgotbar.link ]; then
306 5267b9e4 2021-09-26 stsp echo "dotgotbar.link is a symlink"
307 5267b9e4 2021-09-26 stsp test_done "$testroot" "1"
311 f259c4c1 2021-09-24 stsp # We should have created a merge commit with two parents.
312 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got log -l1 | grep ^parent > $testroot/stdout)
313 f259c4c1 2021-09-24 stsp echo "parent 1: $master_commit" > $testroot/stdout.expected
314 5267b9e4 2021-09-26 stsp echo "parent 2: $branch_commit5" >> $testroot/stdout.expected
315 5267b9e4 2021-09-26 stsp cmp -s $testroot/stdout.expected $testroot/stdout
317 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
318 5267b9e4 2021-09-26 stsp diff -u $testroot/stdout.expected $testroot/stdout
319 5267b9e4 2021-09-26 stsp test_done "$testroot" "$ret"
323 5267b9e4 2021-09-26 stsp got tree -r $testroot/repo -c $merge_commit -R > $testroot/stdout
325 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
326 5267b9e4 2021-09-26 stsp echo "got tree failed unexpectedly" >&2
327 5267b9e4 2021-09-26 stsp test_done "$testroot" "$ret"
331 5267b9e4 2021-09-26 stsp # bad symlink dotgotbar.link appears as a symlink in the merge commit:
332 5267b9e4 2021-09-26 stsp cat > $testroot/stdout.expected <<EOF
334 5267b9e4 2021-09-26 stsp dotgotbar.link@ -> .got/bar
336 5267b9e4 2021-09-26 stsp epsilon/new
337 5267b9e4 2021-09-26 stsp epsilon/zeta
339 5267b9e4 2021-09-26 stsp gamma/delta
340 5267b9e4 2021-09-26 stsp symlink@ -> alpha
342 179f9db0 2023-06-20 falsifian cmp -s $testroot/stdout.expected $testroot/stdout
343 179f9db0 2023-06-20 falsifian ret=$?
344 179f9db0 2023-06-20 falsifian if [ $ret -ne 0 ]; then
345 179f9db0 2023-06-20 falsifian diff -u $testroot/stdout.expected $testroot/stdout
347 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
350 179f9db0 2023-06-20 falsifian test_merge_forward() {
351 179f9db0 2023-06-20 falsifian local testroot=`test_init merge_forward`
352 179f9db0 2023-06-20 falsifian local commit0=`git_show_head $testroot/repo`
354 179f9db0 2023-06-20 falsifian # Create a commit before branching, which will be used to help test
355 179f9db0 2023-06-20 falsifian # preconditions for "got merge".
356 179f9db0 2023-06-20 falsifian echo "modified alpha" > $testroot/repo/alpha
357 179f9db0 2023-06-20 falsifian git_commit $testroot/repo -m "common commit"
358 179f9db0 2023-06-20 falsifian local commit1=`git_show_head $testroot/repo`
360 179f9db0 2023-06-20 falsifian (cd $testroot/repo && git checkout -q -b newbranch)
361 179f9db0 2023-06-20 falsifian echo "modified beta on branch" > $testroot/repo/beta
362 179f9db0 2023-06-20 falsifian git_commit $testroot/repo -m "committing to beta on newbranch"
363 179f9db0 2023-06-20 falsifian local commit2=`git_show_head $testroot/repo`
365 179f9db0 2023-06-20 falsifian got checkout -b master $testroot/repo $testroot/wt > /dev/null
366 179f9db0 2023-06-20 falsifian ret=$?
367 179f9db0 2023-06-20 falsifian if [ $ret -ne 0 ]; then
368 179f9db0 2023-06-20 falsifian echo "got checkout failed unexpectedly" >&2
369 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
370 179f9db0 2023-06-20 falsifian return 1
373 179f9db0 2023-06-20 falsifian # must not use a mixed-commit work tree with 'got merge'
374 179f9db0 2023-06-20 falsifian (cd $testroot/wt && got update -c $commit0 alpha > /dev/null)
375 179f9db0 2023-06-20 falsifian ret=$?
376 179f9db0 2023-06-20 falsifian if [ $ret -ne 0 ]; then
377 179f9db0 2023-06-20 falsifian echo "got update failed unexpectedly" >&2
378 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
379 179f9db0 2023-06-20 falsifian return 1
381 179f9db0 2023-06-20 falsifian (cd $testroot/wt && got merge newbranch \
382 179f9db0 2023-06-20 falsifian > $testroot/stdout 2> $testroot/stderr)
383 179f9db0 2023-06-20 falsifian ret=$?
384 179f9db0 2023-06-20 falsifian if [ $ret -eq 0 ]; then
385 179f9db0 2023-06-20 falsifian echo "got merge succeeded unexpectedly" >&2
386 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
387 179f9db0 2023-06-20 falsifian return 1
389 179f9db0 2023-06-20 falsifian echo -n "got: work tree contains files from multiple base commits; " \
390 179f9db0 2023-06-20 falsifian > $testroot/stderr.expected
391 179f9db0 2023-06-20 falsifian echo "the entire work tree must be updated first" \
392 179f9db0 2023-06-20 falsifian >> $testroot/stderr.expected
393 179f9db0 2023-06-20 falsifian cmp -s $testroot/stderr.expected $testroot/stderr
394 179f9db0 2023-06-20 falsifian ret=$?
395 179f9db0 2023-06-20 falsifian if [ $ret -ne 0 ]; then
396 179f9db0 2023-06-20 falsifian diff -u $testroot/stderr.expected $testroot/stderr
397 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
398 179f9db0 2023-06-20 falsifian return 1
401 179f9db0 2023-06-20 falsifian (cd $testroot/wt && got update > /dev/null)
402 179f9db0 2023-06-20 falsifian ret=$?
403 179f9db0 2023-06-20 falsifian if [ $ret -ne 0 ]; then
404 179f9db0 2023-06-20 falsifian echo "got update failed unexpectedly" >&2
405 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
406 179f9db0 2023-06-20 falsifian return 1
409 179f9db0 2023-06-20 falsifian # 'got merge -n' refuses to fast-forward
410 179f9db0 2023-06-20 falsifian (cd $testroot/wt && got merge -n newbranch \
411 179f9db0 2023-06-20 falsifian > $testroot/stdout 2> $testroot/stderr)
412 179f9db0 2023-06-20 falsifian ret=$?
413 179f9db0 2023-06-20 falsifian if [ $ret -eq 0 ]; then
414 179f9db0 2023-06-20 falsifian echo "got merge succeeded unexpectedly" >&2
415 179f9db0 2023-06-20 falsifian test_done "$testroot" "1"
416 179f9db0 2023-06-20 falsifian return 1
419 f25e229e 2023-06-22 stsp echo -n "got: there are no changes to merge since " \
420 f25e229e 2023-06-22 stsp > $testroot/stderr.expected
421 f25e229e 2023-06-22 stsp echo -n "refs/heads/newbranch is already based on " \
422 179f9db0 2023-06-20 falsifian >> $testroot/stderr.expected
423 f25e229e 2023-06-22 stsp echo -n "refs/heads/master; merge cannot be interrupted " \
424 f25e229e 2023-06-22 stsp >> $testroot/stderr.expected
425 f25e229e 2023-06-22 stsp echo "for amending; -n: option cannot be used" \
426 f25e229e 2023-06-22 stsp >> $testroot/stderr.expected
428 179f9db0 2023-06-20 falsifian cmp -s $testroot/stderr.expected $testroot/stderr
429 179f9db0 2023-06-20 falsifian ret=$?
430 179f9db0 2023-06-20 falsifian if [ $ret -ne 0 ]; then
431 179f9db0 2023-06-20 falsifian diff -u $testroot/stderr.expected $testroot/stderr
432 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
433 179f9db0 2023-06-20 falsifian return 1
436 179f9db0 2023-06-20 falsifian (cd $testroot/wt && got merge newbranch \
437 179f9db0 2023-06-20 falsifian > $testroot/stdout 2> $testroot/stderr)
438 179f9db0 2023-06-20 falsifian ret=$?
439 179f9db0 2023-06-20 falsifian if [ $ret -ne 0 ]; then
440 179f9db0 2023-06-20 falsifian echo "got merge failed unexpectedly" >&2
441 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
442 179f9db0 2023-06-20 falsifian return 1
445 179f9db0 2023-06-20 falsifian echo "Forwarding refs/heads/master to refs/heads/newbranch" \
446 179f9db0 2023-06-20 falsifian > $testroot/stdout.expected
447 179f9db0 2023-06-20 falsifian echo "U beta" >> $testroot/stdout.expected
448 179f9db0 2023-06-20 falsifian echo "Updated to commit $commit2" \
449 179f9db0 2023-06-20 falsifian >> $testroot/stdout.expected
450 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
452 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
453 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
454 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
455 179f9db0 2023-06-20 falsifian return 1
458 179f9db0 2023-06-20 falsifian (cd $testroot/wt && got log | grep ^commit > $testroot/stdout)
459 179f9db0 2023-06-20 falsifian echo -n "commit $commit2 " > $testroot/stdout.expected
460 179f9db0 2023-06-20 falsifian echo "(master, newbranch)" >> $testroot/stdout.expected
461 179f9db0 2023-06-20 falsifian echo "commit $commit1" >> $testroot/stdout.expected
462 179f9db0 2023-06-20 falsifian echo "commit $commit0" >> $testroot/stdout.expected
463 179f9db0 2023-06-20 falsifian cmp -s $testroot/stdout.expected $testroot/stdout
464 179f9db0 2023-06-20 falsifian ret=$?
465 179f9db0 2023-06-20 falsifian if [ $ret -ne 0 ]; then
466 179f9db0 2023-06-20 falsifian diff -u $testroot/stdout.expected $testroot/stdout
467 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
468 179f9db0 2023-06-20 falsifian return 1
470 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
473 179f9db0 2023-06-20 falsifian test_merge_backward() {
474 179f9db0 2023-06-20 falsifian local testroot=`test_init merge_backward`
475 179f9db0 2023-06-20 falsifian local commit0=`git_show_head $testroot/repo`
477 179f9db0 2023-06-20 falsifian (cd $testroot/repo && git checkout -q -b newbranch)
478 179f9db0 2023-06-20 falsifian (cd $testroot/repo && git checkout -q master)
479 179f9db0 2023-06-20 falsifian echo "modified alpha on master" > $testroot/repo/alpha
480 179f9db0 2023-06-20 falsifian git_commit $testroot/repo -m "committing to alpha on master"
482 179f9db0 2023-06-20 falsifian got checkout -b master $testroot/repo $testroot/wt > /dev/null
483 179f9db0 2023-06-20 falsifian ret=$?
484 179f9db0 2023-06-20 falsifian if [ $ret -ne 0 ]; then
485 179f9db0 2023-06-20 falsifian echo "got checkout failed unexpectedly" >&2
486 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
487 179f9db0 2023-06-20 falsifian return 1
490 179f9db0 2023-06-20 falsifian (cd $testroot/wt && got merge newbranch \
491 179f9db0 2023-06-20 falsifian > $testroot/stdout 2> $testroot/stderr)
492 179f9db0 2023-06-20 falsifian ret=$?
493 179f9db0 2023-06-20 falsifian if [ $ret -ne 0 ]; then
494 179f9db0 2023-06-20 falsifian echo "got merge failed unexpectedly" >&2
495 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
496 179f9db0 2023-06-20 falsifian return 1
498 179f9db0 2023-06-20 falsifian echo "Already up-to-date" > $testroot/stdout.expected
499 179f9db0 2023-06-20 falsifian cmp -s $testroot/stdout.expected $testroot/stdout
500 179f9db0 2023-06-20 falsifian ret=$?
501 179f9db0 2023-06-20 falsifian if [ $ret -ne 0 ]; then
502 179f9db0 2023-06-20 falsifian diff -u $testroot/stdout.expected $testroot/stdout
503 179f9db0 2023-06-20 falsifian test_done "$testroot" "$ret"
504 179f9db0 2023-06-20 falsifian return 1
506 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
509 f259c4c1 2021-09-24 stsp test_merge_continue() {
510 f259c4c1 2021-09-24 stsp local testroot=`test_init merge_continue`
511 f259c4c1 2021-09-24 stsp local commit0=`git_show_head $testroot/repo`
512 f259c4c1 2021-09-24 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
514 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q -b newbranch)
515 f259c4c1 2021-09-24 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
516 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
517 f259c4c1 2021-09-24 stsp local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
519 f259c4c1 2021-09-24 stsp echo "modified alpha on branch" > $testroot/repo/alpha
520 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
521 f259c4c1 2021-09-24 stsp local branch_commit1=`git_show_branch_head $testroot/repo newbranch`
522 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git rm -q beta)
523 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "removing beta on newbranch"
524 f259c4c1 2021-09-24 stsp local branch_commit2=`git_show_branch_head $testroot/repo newbranch`
525 f259c4c1 2021-09-24 stsp echo "new file on branch" > $testroot/repo/epsilon/new
526 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git add epsilon/new)
527 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "adding new file on newbranch"
528 f259c4c1 2021-09-24 stsp local branch_commit3=`git_show_branch_head $testroot/repo newbranch`
530 f259c4c1 2021-09-24 stsp got checkout -b master $testroot/repo $testroot/wt > /dev/null
532 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
533 f259c4c1 2021-09-24 stsp echo "got checkout failed unexpectedly" >&2
534 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
538 f259c4c1 2021-09-24 stsp # create a conflicting commit
539 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q master)
540 f259c4c1 2021-09-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
541 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha on master"
542 f259c4c1 2021-09-24 stsp local master_commit=`git_show_head $testroot/repo`
544 5e91dae4 2022-08-30 stsp # need an up-to-date work tree for 'got merge'
545 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got update > /dev/null)
547 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
548 f259c4c1 2021-09-24 stsp echo "got update failed unexpectedly" >&2
549 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
553 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge newbranch \
554 f259c4c1 2021-09-24 stsp > $testroot/stdout 2> $testroot/stderr)
556 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
557 f259c4c1 2021-09-24 stsp echo "got merge succeeded unexpectedly" >&2
558 f259c4c1 2021-09-24 stsp test_done "$testroot" "1"
562 f259c4c1 2021-09-24 stsp echo "C alpha" >> $testroot/stdout.expected
563 f259c4c1 2021-09-24 stsp echo "D beta" >> $testroot/stdout.expected
564 f259c4c1 2021-09-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
565 f259c4c1 2021-09-24 stsp echo "G gamma/delta" >> $testroot/stdout.expected
566 f259c4c1 2021-09-24 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
567 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
569 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
570 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
571 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
575 f259c4c1 2021-09-24 stsp echo "got: conflicts must be resolved before merging can continue" \
576 f259c4c1 2021-09-24 stsp > $testroot/stderr.expected
577 f259c4c1 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
579 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
580 f259c4c1 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
581 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
585 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
587 f259c4c1 2021-09-24 stsp echo "C alpha" > $testroot/stdout.expected
588 f259c4c1 2021-09-24 stsp echo "D beta" >> $testroot/stdout.expected
589 f259c4c1 2021-09-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
590 f259c4c1 2021-09-24 stsp echo "M gamma/delta" >> $testroot/stdout.expected
591 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
593 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
594 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
595 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
599 f259c4c1 2021-09-24 stsp echo '<<<<<<<' > $testroot/content.expected
600 f259c4c1 2021-09-24 stsp echo "modified alpha on master" >> $testroot/content.expected
601 f259c4c1 2021-09-24 stsp echo "||||||| 3-way merge base: commit $commit0" \
602 f259c4c1 2021-09-24 stsp >> $testroot/content.expected
603 f259c4c1 2021-09-24 stsp echo "alpha" >> $testroot/content.expected
604 f259c4c1 2021-09-24 stsp echo "=======" >> $testroot/content.expected
605 f259c4c1 2021-09-24 stsp echo "modified alpha on branch" >> $testroot/content.expected
606 f259c4c1 2021-09-24 stsp echo ">>>>>>> merged change: commit $branch_commit3" \
607 f259c4c1 2021-09-24 stsp >> $testroot/content.expected
608 f259c4c1 2021-09-24 stsp cat $testroot/wt/alpha > $testroot/content
609 f259c4c1 2021-09-24 stsp cmp -s $testroot/content.expected $testroot/content
611 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
612 f259c4c1 2021-09-24 stsp diff -u $testroot/content.expected $testroot/content
613 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
617 f259c4c1 2021-09-24 stsp # resolve the conflict
618 f259c4c1 2021-09-24 stsp echo "modified alpha by both branches" > $testroot/wt/alpha
620 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge -c > $testroot/stdout)
622 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
623 f259c4c1 2021-09-24 stsp echo "got merge failed unexpectedly" >&2
624 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
628 f259c4c1 2021-09-24 stsp local merge_commit=`git_show_head $testroot/repo`
630 0ff8d236 2021-09-28 stsp echo "M alpha" > $testroot/stdout.expected
631 0ff8d236 2021-09-28 stsp echo "D beta" >> $testroot/stdout.expected
632 0ff8d236 2021-09-28 stsp echo "A epsilon/new" >> $testroot/stdout.expected
633 0ff8d236 2021-09-28 stsp echo "M gamma/delta" >> $testroot/stdout.expected
634 f259c4c1 2021-09-24 stsp echo -n "Merged refs/heads/newbranch into refs/heads/master: " \
635 0ff8d236 2021-09-28 stsp >> $testroot/stdout.expected
636 f259c4c1 2021-09-24 stsp echo $merge_commit >> $testroot/stdout.expected
638 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
640 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
641 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
642 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
646 f259c4c1 2021-09-24 stsp echo "modified delta on branch" > $testroot/content.expected
647 f259c4c1 2021-09-24 stsp cat $testroot/wt/gamma/delta > $testroot/content
648 f259c4c1 2021-09-24 stsp cmp -s $testroot/content.expected $testroot/content
650 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
651 f259c4c1 2021-09-24 stsp diff -u $testroot/content.expected $testroot/content
652 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
656 f259c4c1 2021-09-24 stsp echo "modified alpha by both branches" > $testroot/content.expected
657 f259c4c1 2021-09-24 stsp cat $testroot/wt/alpha > $testroot/content
658 f259c4c1 2021-09-24 stsp cmp -s $testroot/content.expected $testroot/content
660 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
661 f259c4c1 2021-09-24 stsp diff -u $testroot/content.expected $testroot/content
662 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
666 f259c4c1 2021-09-24 stsp if [ -e $testroot/wt/beta ]; then
667 f259c4c1 2021-09-24 stsp echo "removed file beta still exists on disk" >&2
668 f259c4c1 2021-09-24 stsp test_done "$testroot" "1"
672 f259c4c1 2021-09-24 stsp echo "new file on branch" > $testroot/content.expected
673 f259c4c1 2021-09-24 stsp cat $testroot/wt/epsilon/new > $testroot/content
674 f259c4c1 2021-09-24 stsp cmp -s $testroot/content.expected $testroot/content
676 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
677 f259c4c1 2021-09-24 stsp diff -u $testroot/content.expected $testroot/content
678 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
682 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
684 f259c4c1 2021-09-24 stsp echo -n > $testroot/stdout.expected
685 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
687 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
688 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
689 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
693 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
694 f259c4c1 2021-09-24 stsp echo "commit $merge_commit (master)" > $testroot/stdout.expected
695 f259c4c1 2021-09-24 stsp echo "commit $master_commit" >> $testroot/stdout.expected
696 f259c4c1 2021-09-24 stsp echo "commit $commit0" >> $testroot/stdout.expected
697 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
699 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
700 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
701 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
705 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got update > $testroot/stdout)
707 f259c4c1 2021-09-24 stsp echo 'Already up-to-date' > $testroot/stdout.expected
708 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
710 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
711 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
712 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
716 f259c4c1 2021-09-24 stsp # We should have created a merge commit with two parents.
717 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got log -l1 | grep ^parent > $testroot/stdout)
718 f259c4c1 2021-09-24 stsp echo "parent 1: $master_commit" > $testroot/stdout.expected
719 f259c4c1 2021-09-24 stsp echo "parent 2: $branch_commit3" >> $testroot/stdout.expected
720 6b5246e4 2023-06-05 stsp cmp -s $testroot/stdout.expected $testroot/stdout
722 6b5246e4 2023-06-05 stsp if [ $ret -ne 0 ]; then
723 6b5246e4 2023-06-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
725 6b5246e4 2023-06-05 stsp test_done "$testroot" "$ret"
728 6b5246e4 2023-06-05 stsp test_merge_continue_new_commit() {
729 6b5246e4 2023-06-05 stsp # "got merge -c" should refuse to run if the current branch tip has
730 6b5246e4 2023-06-05 stsp # changed since the merge was started, to avoid clobbering the changes.
731 6b5246e4 2023-06-05 stsp local testroot=`test_init merge_continue_new_commit`
733 6b5246e4 2023-06-05 stsp (cd $testroot/repo && git checkout -q -b newbranch)
734 6b5246e4 2023-06-05 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
735 6b5246e4 2023-06-05 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
737 6b5246e4 2023-06-05 stsp (cd $testroot/repo && git checkout -q master)
738 6b5246e4 2023-06-05 stsp echo "modified alpha on master" > $testroot/repo/alpha
739 6b5246e4 2023-06-05 stsp git_commit $testroot/repo -m "committing to alpha on master"
741 6b5246e4 2023-06-05 stsp got checkout -b master $testroot/repo $testroot/wt > /dev/null
743 6b5246e4 2023-06-05 stsp if [ $ret -ne 0 ]; then
744 6b5246e4 2023-06-05 stsp echo "got checkout failed unexpectedly" >&2
745 6b5246e4 2023-06-05 stsp test_done "$testroot" "$ret"
749 6b5246e4 2023-06-05 stsp (cd $testroot/wt && got merge -n newbranch >/dev/null)
751 6b5246e4 2023-06-05 stsp if [ $ret -ne 0 ]; then
752 6b5246e4 2023-06-05 stsp echo "got merge failed unexpectedly" >&2
753 6b5246e4 2023-06-05 stsp test_done "$testroot" "$ret"
757 6b5246e4 2023-06-05 stsp echo "modified alpha again on master" > $testroot/repo/alpha
758 6b5246e4 2023-06-05 stsp git_commit $testroot/repo -m "committing to alpha on master again"
760 6b5246e4 2023-06-05 stsp (cd $testroot/wt && got merge -c > $testroot/stdout 2> $testroot/stderr)
762 6b5246e4 2023-06-05 stsp if [ $ret -eq 0 ]; then
763 6b5246e4 2023-06-05 stsp echo "got merge succeeded unexpectedly" >&2
764 6b5246e4 2023-06-05 stsp test_done "$testroot" "1"
768 6b5246e4 2023-06-05 stsp echo -n > $testroot/stdout.expected
769 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
771 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
772 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
773 6b5246e4 2023-06-05 stsp test_done "$testroot" "$ret"
777 6b5246e4 2023-06-05 stsp echo -n "got: merging cannot proceed because the work tree is no " \
778 6b5246e4 2023-06-05 stsp > $testroot/stderr.expected
779 6b5246e4 2023-06-05 stsp echo "longer up-to-date; merge must be aborted and retried" \
780 6b5246e4 2023-06-05 stsp >> $testroot/stderr.expected
781 6b5246e4 2023-06-05 stsp cmp -s $testroot/stderr.expected $testroot/stderr
783 6b5246e4 2023-06-05 stsp if [ $ret -ne 0 ]; then
784 6b5246e4 2023-06-05 stsp diff -u $testroot/stderr.expected $testroot/stderr
786 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
789 f259c4c1 2021-09-24 stsp test_merge_abort() {
790 f259c4c1 2021-09-24 stsp local testroot=`test_init merge_abort`
791 f259c4c1 2021-09-24 stsp local commit0=`git_show_head $testroot/repo`
792 f259c4c1 2021-09-24 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
794 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q -b newbranch)
795 f259c4c1 2021-09-24 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
796 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
797 f259c4c1 2021-09-24 stsp local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
799 f259c4c1 2021-09-24 stsp echo "modified alpha on branch" > $testroot/repo/alpha
800 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
801 f259c4c1 2021-09-24 stsp local branch_commit1=`git_show_branch_head $testroot/repo newbranch`
802 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git rm -q beta)
803 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "removing beta on newbranch"
804 f259c4c1 2021-09-24 stsp local branch_commit2=`git_show_branch_head $testroot/repo newbranch`
805 f259c4c1 2021-09-24 stsp echo "new file on branch" > $testroot/repo/epsilon/new
806 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git add epsilon/new)
807 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "adding new file on newbranch"
808 f259c4c1 2021-09-24 stsp local branch_commit3=`git_show_branch_head $testroot/repo newbranch`
809 f259c4c1 2021-09-24 stsp (cd $testroot/repo && ln -s alpha symlink && git add symlink)
810 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "adding symlink on newbranch"
811 f259c4c1 2021-09-24 stsp local branch_commit4=`git_show_branch_head $testroot/repo newbranch`
813 f259c4c1 2021-09-24 stsp got checkout -b master $testroot/repo $testroot/wt > /dev/null
815 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
816 f259c4c1 2021-09-24 stsp echo "got checkout failed unexpectedly" >&2
817 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
821 41f061b2 2021-10-05 stsp # unrelated unversioned file in work tree
822 41f061b2 2021-10-05 stsp touch $testroot/wt/unversioned-file
824 f259c4c1 2021-09-24 stsp # create a conflicting commit
825 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q master)
826 f259c4c1 2021-09-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
827 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha on master"
828 f259c4c1 2021-09-24 stsp local master_commit=`git_show_head $testroot/repo`
830 5e91dae4 2022-08-30 stsp # need an up-to-date work tree for 'got merge'
831 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got update > /dev/null)
833 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
834 f259c4c1 2021-09-24 stsp echo "got update failed unexpectedly" >&2
835 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
839 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge newbranch \
840 f259c4c1 2021-09-24 stsp > $testroot/stdout 2> $testroot/stderr)
842 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
843 f259c4c1 2021-09-24 stsp echo "got merge succeeded unexpectedly" >&2
844 f259c4c1 2021-09-24 stsp test_done "$testroot" "1"
848 f259c4c1 2021-09-24 stsp echo "C alpha" >> $testroot/stdout.expected
849 f259c4c1 2021-09-24 stsp echo "D beta" >> $testroot/stdout.expected
850 f259c4c1 2021-09-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
851 f259c4c1 2021-09-24 stsp echo "G gamma/delta" >> $testroot/stdout.expected
852 f259c4c1 2021-09-24 stsp echo "A symlink" >> $testroot/stdout.expected
853 f259c4c1 2021-09-24 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
854 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
856 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
857 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
858 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
862 f259c4c1 2021-09-24 stsp echo "got: conflicts must be resolved before merging can continue" \
863 f259c4c1 2021-09-24 stsp > $testroot/stderr.expected
864 f259c4c1 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
866 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
867 f259c4c1 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
868 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
872 af179be7 2023-04-14 stsp # unrelated added file added during conflict resolution
873 af179be7 2023-04-14 stsp touch $testroot/wt/added-file
874 af179be7 2023-04-14 stsp (cd $testroot/wt && got add added-file > /dev/null)
876 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
878 af179be7 2023-04-14 stsp echo "A added-file" > $testroot/stdout.expected
879 af179be7 2023-04-14 stsp echo "C alpha" >> $testroot/stdout.expected
880 f259c4c1 2021-09-24 stsp echo "D beta" >> $testroot/stdout.expected
881 f259c4c1 2021-09-24 stsp echo "A epsilon/new" >> $testroot/stdout.expected
882 f259c4c1 2021-09-24 stsp echo "M gamma/delta" >> $testroot/stdout.expected
883 f259c4c1 2021-09-24 stsp echo "A symlink" >> $testroot/stdout.expected
884 41f061b2 2021-10-05 stsp echo "? unversioned-file" >> $testroot/stdout.expected
885 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
887 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
888 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
889 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
893 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge -a > $testroot/stdout)
895 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
896 f259c4c1 2021-09-24 stsp echo "got merge failed unexpectedly" >&2
897 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
901 af179be7 2023-04-14 stsp echo "R added-file" > $testroot/stdout.expected
902 af179be7 2023-04-14 stsp echo "R alpha" >> $testroot/stdout.expected
903 f259c4c1 2021-09-24 stsp echo "R beta" >> $testroot/stdout.expected
904 f259c4c1 2021-09-24 stsp echo "R epsilon/new" >> $testroot/stdout.expected
905 f259c4c1 2021-09-24 stsp echo "R gamma/delta" >> $testroot/stdout.expected
906 f259c4c1 2021-09-24 stsp echo "R symlink" >> $testroot/stdout.expected
907 af179be7 2023-04-14 stsp echo "G added-file" >> $testroot/stdout.expected
908 f259c4c1 2021-09-24 stsp echo "Merge of refs/heads/newbranch aborted" \
909 f259c4c1 2021-09-24 stsp >> $testroot/stdout.expected
911 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
913 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
914 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
915 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
919 f259c4c1 2021-09-24 stsp echo "delta" > $testroot/content.expected
920 f259c4c1 2021-09-24 stsp cat $testroot/wt/gamma/delta > $testroot/content
921 f259c4c1 2021-09-24 stsp cmp -s $testroot/content.expected $testroot/content
923 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
924 f259c4c1 2021-09-24 stsp diff -u $testroot/content.expected $testroot/content
925 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
929 f259c4c1 2021-09-24 stsp echo "modified alpha on master" > $testroot/content.expected
930 f259c4c1 2021-09-24 stsp cat $testroot/wt/alpha > $testroot/content
931 f259c4c1 2021-09-24 stsp cmp -s $testroot/content.expected $testroot/content
933 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
934 f259c4c1 2021-09-24 stsp diff -u $testroot/content.expected $testroot/content
935 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
939 f259c4c1 2021-09-24 stsp echo "beta" > $testroot/content.expected
940 f259c4c1 2021-09-24 stsp cat $testroot/wt/beta > $testroot/content
941 f259c4c1 2021-09-24 stsp cmp -s $testroot/content.expected $testroot/content
943 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
944 f259c4c1 2021-09-24 stsp diff -u $testroot/content.expected $testroot/content
945 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
949 f259c4c1 2021-09-24 stsp if [ -e $testroot/wt/epsilon/new ]; then
950 f259c4c1 2021-09-24 stsp echo "reverted file epsilon/new still exists on disk" >&2
951 f259c4c1 2021-09-24 stsp test_done "$testroot" "1"
955 f259c4c1 2021-09-24 stsp if [ -e $testroot/wt/symlink ]; then
956 f259c4c1 2021-09-24 stsp echo "reverted symlink still exists on disk" >&2
957 f259c4c1 2021-09-24 stsp test_done "$testroot" "1"
961 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
963 af179be7 2023-04-14 stsp echo "? added-file" > $testroot/stdout.expected
964 af179be7 2023-04-14 stsp echo "? unversioned-file" >> $testroot/stdout.expected
965 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
967 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
968 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
969 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
973 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
974 f259c4c1 2021-09-24 stsp echo "commit $master_commit (master)" > $testroot/stdout.expected
975 f259c4c1 2021-09-24 stsp echo "commit $commit0" >> $testroot/stdout.expected
976 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
978 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
979 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
980 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
984 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got update > $testroot/stdout)
986 f259c4c1 2021-09-24 stsp echo 'Already up-to-date' > $testroot/stdout.expected
987 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
989 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
990 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
992 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
995 f259c4c1 2021-09-24 stsp test_merge_in_progress() {
996 f259c4c1 2021-09-24 stsp local testroot=`test_init merge_in_progress`
997 f259c4c1 2021-09-24 stsp local commit0=`git_show_head $testroot/repo`
998 f259c4c1 2021-09-24 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
1000 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1001 f259c4c1 2021-09-24 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1002 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
1003 f259c4c1 2021-09-24 stsp local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
1005 f259c4c1 2021-09-24 stsp got checkout -b master $testroot/repo $testroot/wt > /dev/null
1007 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1008 f259c4c1 2021-09-24 stsp echo "got checkout failed unexpectedly" >&2
1009 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1013 f259c4c1 2021-09-24 stsp # create a conflicting commit
1014 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q master)
1015 f259c4c1 2021-09-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
1016 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha on master"
1017 f259c4c1 2021-09-24 stsp local master_commit=`git_show_head $testroot/repo`
1019 5e91dae4 2022-08-30 stsp # need an up-to-date work tree for 'got merge'
1020 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got update > /dev/null)
1022 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1023 f259c4c1 2021-09-24 stsp echo "got update failed unexpectedly" >&2
1024 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1028 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge newbranch \
1029 f259c4c1 2021-09-24 stsp > $testroot/stdout 2> $testroot/stderr)
1031 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1032 f259c4c1 2021-09-24 stsp echo "got merge succeeded unexpectedly" >&2
1033 f259c4c1 2021-09-24 stsp test_done "$testroot" "1"
1037 f259c4c1 2021-09-24 stsp echo "C alpha" >> $testroot/stdout.expected
1038 f259c4c1 2021-09-24 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
1039 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1041 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1042 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1043 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1047 f259c4c1 2021-09-24 stsp echo "got: conflicts must be resolved before merging can continue" \
1048 f259c4c1 2021-09-24 stsp > $testroot/stderr.expected
1049 f259c4c1 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1051 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1052 f259c4c1 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
1053 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1057 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
1059 f259c4c1 2021-09-24 stsp echo "C alpha" > $testroot/stdout.expected
1060 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1062 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1063 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1064 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1068 f259c4c1 2021-09-24 stsp for cmd in update commit histedit "rebase newbranch" \
1069 42761529 2023-06-01 stsp "integrate newbranch" "merge newbranch" "stage alpha"; do
1070 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got $cmd > $testroot/stdout \
1071 f259c4c1 2021-09-24 stsp 2> $testroot/stderr)
1073 42761529 2023-06-01 stsp if [ $ret -eq 0 ]; then
1074 42761529 2023-06-01 stsp echo "got $cmd succeeded unexpectedly" >&2
1075 42761529 2023-06-01 stsp test_done "$testroot" "1"
1079 f259c4c1 2021-09-24 stsp echo -n > $testroot/stdout.expected
1080 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1082 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1083 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1084 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1088 f259c4c1 2021-09-24 stsp echo -n "got: a merge operation is in progress in this " \
1089 f259c4c1 2021-09-24 stsp > $testroot/stderr.expected
1090 f259c4c1 2021-09-24 stsp echo "work tree and must be continued or aborted first" \
1091 f259c4c1 2021-09-24 stsp >> $testroot/stderr.expected
1092 f259c4c1 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1094 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1095 f259c4c1 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
1096 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1101 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1104 f259c4c1 2021-09-24 stsp test_merge_path_prefix() {
1105 f259c4c1 2021-09-24 stsp local testroot=`test_init merge_path_prefix`
1106 f259c4c1 2021-09-24 stsp local commit0=`git_show_head $testroot/repo`
1107 f259c4c1 2021-09-24 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
1109 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1110 f259c4c1 2021-09-24 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1111 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
1112 f259c4c1 2021-09-24 stsp local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
1114 f259c4c1 2021-09-24 stsp got checkout -p epsilon -b master $testroot/repo $testroot/wt \
1115 f259c4c1 2021-09-24 stsp > /dev/null
1117 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1118 f259c4c1 2021-09-24 stsp echo "got checkout failed unexpectedly" >&2
1119 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1123 f259c4c1 2021-09-24 stsp # create a conflicting commit
1124 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q master)
1125 f259c4c1 2021-09-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
1126 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha on master"
1127 f259c4c1 2021-09-24 stsp local master_commit=`git_show_head $testroot/repo`
1129 5e91dae4 2022-08-30 stsp # need an up-to-date work tree for 'got merge'
1130 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got update > /dev/null)
1132 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1133 f259c4c1 2021-09-24 stsp echo "got update failed unexpectedly" >&2
1134 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1138 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge newbranch \
1139 f259c4c1 2021-09-24 stsp > $testroot/stdout 2> $testroot/stderr)
1141 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1142 f259c4c1 2021-09-24 stsp echo "got merge succeeded unexpectedly" >&2
1143 f259c4c1 2021-09-24 stsp test_done "$testroot" "1"
1147 f259c4c1 2021-09-24 stsp echo -n "got: cannot merge branch which contains changes outside " \
1148 f259c4c1 2021-09-24 stsp > $testroot/stderr.expected
1149 f259c4c1 2021-09-24 stsp echo "of this work tree's path prefix" >> $testroot/stderr.expected
1150 f259c4c1 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1152 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1153 f259c4c1 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
1155 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1158 f259c4c1 2021-09-24 stsp test_merge_missing_file() {
1159 f259c4c1 2021-09-24 stsp local testroot=`test_init merge_missing_file`
1160 f259c4c1 2021-09-24 stsp local commit0=`git_show_head $testroot/repo`
1161 f259c4c1 2021-09-24 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
1163 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1164 f259c4c1 2021-09-24 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1165 f259c4c1 2021-09-24 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1166 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha and delta"
1167 f259c4c1 2021-09-24 stsp local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
1169 f259c4c1 2021-09-24 stsp got checkout -b master $testroot/repo $testroot/wt > /dev/null
1171 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1172 f259c4c1 2021-09-24 stsp echo "got checkout failed unexpectedly" >&2
1173 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1177 f259c4c1 2021-09-24 stsp # create a conflicting commit which renames alpha
1178 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git checkout -q master)
1179 f259c4c1 2021-09-24 stsp (cd $testroot/repo && git mv alpha epsilon/alpha-moved)
1180 f259c4c1 2021-09-24 stsp git_commit $testroot/repo -m "moving alpha on master"
1181 f259c4c1 2021-09-24 stsp local master_commit=`git_show_head $testroot/repo`
1183 5e91dae4 2022-08-30 stsp # need an up-to-date work tree for 'got merge'
1184 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got update > /dev/null)
1186 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1187 f259c4c1 2021-09-24 stsp echo "got update failed unexpectedly" >&2
1188 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1192 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got merge newbranch \
1193 f259c4c1 2021-09-24 stsp > $testroot/stdout 2> $testroot/stderr)
1195 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1196 f259c4c1 2021-09-24 stsp echo "got merge succeeded unexpectedly" >&2
1197 f259c4c1 2021-09-24 stsp test_done "$testroot" "1"
1201 f259c4c1 2021-09-24 stsp echo "! alpha" > $testroot/stdout.expected
1202 f259c4c1 2021-09-24 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1203 35ca1db7 2021-09-28 stsp echo -n "Files which had incoming changes but could not be found " \
1204 35ca1db7 2021-09-28 stsp >> $testroot/stdout.expected
1205 35ca1db7 2021-09-28 stsp echo "in the work tree: 1" >> $testroot/stdout.expected
1206 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1208 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1209 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1210 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1214 c1b05723 2021-09-28 stsp echo -n "got: changes destined for some files " \
1215 f259c4c1 2021-09-24 stsp > $testroot/stderr.expected
1216 f259c4c1 2021-09-24 stsp echo -n "were not yet merged and should be merged manually if " \
1217 f259c4c1 2021-09-24 stsp >> $testroot/stderr.expected
1218 f259c4c1 2021-09-24 stsp echo "required before the merge operation is continued" \
1219 f259c4c1 2021-09-24 stsp >> $testroot/stderr.expected
1220 f259c4c1 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1222 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1223 f259c4c1 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
1224 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1228 f259c4c1 2021-09-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
1230 f259c4c1 2021-09-24 stsp echo "M gamma/delta" > $testroot/stdout.expected
1231 a6a8f8bb 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1233 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1234 a6a8f8bb 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1235 a6a8f8bb 2021-09-24 stsp test_done "$testroot" "$ret"
1239 a6a8f8bb 2021-09-24 stsp test_done "$testroot" "$ret"
1242 a6a8f8bb 2021-09-24 stsp test_merge_no_op() {
1243 a6a8f8bb 2021-09-24 stsp local testroot=`test_init merge_no_op`
1244 a6a8f8bb 2021-09-24 stsp local commit0=`git_show_head $testroot/repo`
1245 a6a8f8bb 2021-09-24 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
1247 a6a8f8bb 2021-09-24 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1248 a6a8f8bb 2021-09-24 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1249 a6a8f8bb 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
1250 35d2583f 2023-04-17 stsp local branch_commit=`git_show_branch_head $testroot/repo newbranch`
1252 a6a8f8bb 2021-09-24 stsp got checkout -b master $testroot/repo $testroot/wt > /dev/null
1254 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1255 a6a8f8bb 2021-09-24 stsp echo "got checkout failed unexpectedly" >&2
1256 a6a8f8bb 2021-09-24 stsp test_done "$testroot" "$ret"
1260 a6a8f8bb 2021-09-24 stsp # create a conflicting commit
1261 a6a8f8bb 2021-09-24 stsp (cd $testroot/repo && git checkout -q master)
1262 a6a8f8bb 2021-09-24 stsp echo "modified alpha on master" > $testroot/repo/alpha
1263 a6a8f8bb 2021-09-24 stsp git_commit $testroot/repo -m "committing to alpha on master"
1264 a6a8f8bb 2021-09-24 stsp local master_commit=`git_show_head $testroot/repo`
1266 5e91dae4 2022-08-30 stsp # need an up-to-date work tree for 'got merge'
1267 a6a8f8bb 2021-09-24 stsp (cd $testroot/wt && got update > /dev/null)
1269 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1270 a6a8f8bb 2021-09-24 stsp echo "got update failed unexpectedly" >&2
1271 a6a8f8bb 2021-09-24 stsp test_done "$testroot" "$ret"
1275 a6a8f8bb 2021-09-24 stsp (cd $testroot/wt && got merge newbranch \
1276 a6a8f8bb 2021-09-24 stsp > $testroot/stdout 2> $testroot/stderr)
1278 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1279 a6a8f8bb 2021-09-24 stsp echo "got merge succeeded unexpectedly" >&2
1280 a6a8f8bb 2021-09-24 stsp test_done "$testroot" "1"
1284 a6a8f8bb 2021-09-24 stsp echo "C alpha" >> $testroot/stdout.expected
1285 a6a8f8bb 2021-09-24 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
1286 a6a8f8bb 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1288 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1289 a6a8f8bb 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1290 a6a8f8bb 2021-09-24 stsp test_done "$testroot" "$ret"
1294 a6a8f8bb 2021-09-24 stsp echo "got: conflicts must be resolved before merging can continue" \
1295 a6a8f8bb 2021-09-24 stsp > $testroot/stderr.expected
1296 a6a8f8bb 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1298 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1299 a6a8f8bb 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
1300 a6a8f8bb 2021-09-24 stsp test_done "$testroot" "$ret"
1304 a6a8f8bb 2021-09-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
1306 a6a8f8bb 2021-09-24 stsp echo "C alpha" > $testroot/stdout.expected
1307 f259c4c1 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1309 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1310 f259c4c1 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1311 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1315 a6a8f8bb 2021-09-24 stsp # resolve the conflict by reverting all changes; now it is no-op merge
1316 a6a8f8bb 2021-09-24 stsp (cd $testroot/wt && got revert alpha > /dev/null)
1318 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1319 a6a8f8bb 2021-09-24 stsp echo "got revert failed unexpectedly" >&2
1320 a6a8f8bb 2021-09-24 stsp test_done "$testroot" "$ret"
1324 a6a8f8bb 2021-09-24 stsp (cd $testroot/wt && got merge -c > $testroot/stdout \
1325 a6a8f8bb 2021-09-24 stsp 2> $testroot/stderr)
1327 35d2583f 2023-04-17 stsp if [ $ret -ne 0 ]; then
1328 35d2583f 2023-04-17 stsp echo "got merge failed unexpectedly" >&2
1329 a6a8f8bb 2021-09-24 stsp test_done "$testroot" "$ret"
1333 35d2583f 2023-04-17 stsp echo -n '' > $testroot/stderr.expected
1334 a6a8f8bb 2021-09-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1336 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1337 a6a8f8bb 2021-09-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
1338 35d2583f 2023-04-17 stsp test_done "$testroot" "$ret"
1342 35d2583f 2023-04-17 stsp local merge_commit=`git_show_head $testroot/repo`
1343 35d2583f 2023-04-17 stsp echo -n "Merged refs/heads/newbranch into refs/heads/master: " \
1344 35d2583f 2023-04-17 stsp > $testroot/stdout.expected
1345 35d2583f 2023-04-17 stsp echo $merge_commit >> $testroot/stdout.expected
1347 35d2583f 2023-04-17 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1349 35d2583f 2023-04-17 stsp if [ $ret -ne 0 ]; then
1350 35d2583f 2023-04-17 stsp diff -u $testroot/stdout.expected $testroot/stdout
1351 a6a8f8bb 2021-09-24 stsp test_done "$testroot" "$ret"
1355 a6a8f8bb 2021-09-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
1357 a6a8f8bb 2021-09-24 stsp echo -n "" > $testroot/stdout.expected
1358 4e91ef15 2021-09-26 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1360 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1361 4e91ef15 2021-09-26 stsp diff -u $testroot/stdout.expected $testroot/stdout
1362 35d2583f 2023-04-17 stsp test_done "$testroot" "$ret"
1366 35d2583f 2023-04-17 stsp # We should have created a merge commit with two parents.
1367 35d2583f 2023-04-17 stsp got log -r $testroot/repo -l1 -c $merge_commit | grep ^parent \
1368 35d2583f 2023-04-17 stsp > $testroot/stdout
1369 35d2583f 2023-04-17 stsp echo "parent 1: $master_commit" > $testroot/stdout.expected
1370 35d2583f 2023-04-17 stsp echo "parent 2: $branch_commit" >> $testroot/stdout.expected
1371 35d2583f 2023-04-17 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1373 35d2583f 2023-04-17 stsp if [ $ret -ne 0 ]; then
1374 35d2583f 2023-04-17 stsp diff -u $testroot/stdout.expected $testroot/stdout
1376 4e91ef15 2021-09-26 stsp test_done "$testroot" "$ret"
1379 4e91ef15 2021-09-26 stsp test_merge_imported_branch() {
1380 4e91ef15 2021-09-26 stsp local testroot=`test_init merge_import`
1381 4e91ef15 2021-09-26 stsp local commit0=`git_show_head $testroot/repo`
1382 4e91ef15 2021-09-26 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
1384 4e91ef15 2021-09-26 stsp # import a new sub-tree to the 'files' branch such that
1385 4e91ef15 2021-09-26 stsp # none of the files added here collide with existing ones
1386 4e91ef15 2021-09-26 stsp mkdir -p $testroot/tree/there
1387 4e91ef15 2021-09-26 stsp mkdir -p $testroot/tree/be/lots
1388 4e91ef15 2021-09-26 stsp mkdir -p $testroot/tree/files
1389 4e91ef15 2021-09-26 stsp echo "there should" > $testroot/tree/there/should
1390 4e91ef15 2021-09-26 stsp echo "be lots of" > $testroot/tree/be/lots/of
1391 4e91ef15 2021-09-26 stsp echo "files here" > $testroot/tree/files/here
1392 4e91ef15 2021-09-26 stsp got import -r $testroot/repo -b files -m 'import files' \
1393 4e91ef15 2021-09-26 stsp $testroot/tree > /dev/null
1395 4e91ef15 2021-09-26 stsp got checkout -b master $testroot/repo $testroot/wt > /dev/null
1397 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1398 4e91ef15 2021-09-26 stsp echo "got checkout failed unexpectedly" >&2
1399 4e91ef15 2021-09-26 stsp test_done "$testroot" "$ret"
1403 4e91ef15 2021-09-26 stsp (cd $testroot/wt && got merge files > $testroot/stdout)
1405 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1406 4e91ef15 2021-09-26 stsp echo "got merge failed unexpectedly" >&2
1407 4e91ef15 2021-09-26 stsp test_done "$testroot" "$ret"
1411 4e91ef15 2021-09-26 stsp local merge_commit0=`git_show_head $testroot/repo`
1412 4e91ef15 2021-09-26 stsp cat > $testroot/stdout.expected <<EOF
1413 4e91ef15 2021-09-26 stsp A be/lots/of
1414 4e91ef15 2021-09-26 stsp A files/here
1415 4e91ef15 2021-09-26 stsp A there/should
1416 4e91ef15 2021-09-26 stsp Merged refs/heads/files into refs/heads/master: $merge_commit0
1418 4e91ef15 2021-09-26 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1420 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1421 4e91ef15 2021-09-26 stsp diff -u $testroot/stdout.expected $testroot/stdout
1422 4e91ef15 2021-09-26 stsp test_done "$testroot" "$ret"
1426 4e91ef15 2021-09-26 stsp # try to merge again while no new changes are available
1427 4e91ef15 2021-09-26 stsp (cd $testroot/wt && got merge files > $testroot/stdout)
1429 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1430 4e91ef15 2021-09-26 stsp echo "got merge failed unexpectedly" >&2
1431 4e91ef15 2021-09-26 stsp test_done "$testroot" "$ret"
1434 4e91ef15 2021-09-26 stsp echo "Already up-to-date" > $testroot/stdout.expected
1435 a6a8f8bb 2021-09-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1437 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1438 a6a8f8bb 2021-09-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1439 4e91ef15 2021-09-26 stsp test_done "$testroot" "$ret"
1443 4e91ef15 2021-09-26 stsp # update the 'files' branch
1444 4e91ef15 2021-09-26 stsp (cd $testroot/repo && git reset -q --hard master)
1445 4e91ef15 2021-09-26 stsp (cd $testroot/repo && git checkout -q files)
1446 4e91ef15 2021-09-26 stsp echo "indeed" > $testroot/repo/indeed
1447 4e91ef15 2021-09-26 stsp (cd $testroot/repo && git add indeed)
1448 4e91ef15 2021-09-26 stsp git_commit $testroot/repo -m "adding another file indeed"
1449 4e91ef15 2021-09-26 stsp echo "be lots and lots of" > $testroot/repo/be/lots/of
1450 4e91ef15 2021-09-26 stsp git_commit $testroot/repo -m "lots of changes"
1452 4e91ef15 2021-09-26 stsp (cd $testroot/wt && got update > /dev/null)
1454 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1455 4e91ef15 2021-09-26 stsp echo "got update failed unexpectedly" >&2
1456 4e91ef15 2021-09-26 stsp test_done "$testroot" "$ret"
1460 4e91ef15 2021-09-26 stsp # we should now be able to merge more changes from files branch
1461 4e91ef15 2021-09-26 stsp (cd $testroot/wt && got merge files > $testroot/stdout)
1463 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1464 4e91ef15 2021-09-26 stsp echo "got merge failed unexpectedly" >&2
1465 4e91ef15 2021-09-26 stsp test_done "$testroot" "$ret"
1469 4e91ef15 2021-09-26 stsp local merge_commit1=`git_show_branch_head $testroot/repo master`
1470 4e91ef15 2021-09-26 stsp cat > $testroot/stdout.expected <<EOF
1471 4e91ef15 2021-09-26 stsp G be/lots/of
1473 4e91ef15 2021-09-26 stsp Merged refs/heads/files into refs/heads/master: $merge_commit1
1476 4e91ef15 2021-09-26 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1478 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1479 4e91ef15 2021-09-26 stsp diff -u $testroot/stdout.expected $testroot/stdout
1481 f259c4c1 2021-09-24 stsp test_done "$testroot" "$ret"
1484 088449d3 2021-09-26 stsp test_merge_interrupt() {
1485 088449d3 2021-09-26 stsp local testroot=`test_init merge_interrupt`
1486 088449d3 2021-09-26 stsp local commit0=`git_show_head $testroot/repo`
1487 088449d3 2021-09-26 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
1489 088449d3 2021-09-26 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1490 088449d3 2021-09-26 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1491 088449d3 2021-09-26 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
1492 088449d3 2021-09-26 stsp local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
1494 088449d3 2021-09-26 stsp got checkout -b master $testroot/repo $testroot/wt > /dev/null
1496 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1497 088449d3 2021-09-26 stsp echo "got checkout failed unexpectedly" >&2
1498 088449d3 2021-09-26 stsp test_done "$testroot" "$ret"
1502 088449d3 2021-09-26 stsp # create a non-conflicting commit
1503 088449d3 2021-09-26 stsp (cd $testroot/repo && git checkout -q master)
1504 088449d3 2021-09-26 stsp echo "modified beta on master" > $testroot/repo/beta
1505 088449d3 2021-09-26 stsp git_commit $testroot/repo -m "committing to beta on master"
1506 088449d3 2021-09-26 stsp local master_commit=`git_show_head $testroot/repo`
1508 5e91dae4 2022-08-30 stsp # need an up-to-date work tree for 'got merge'
1509 088449d3 2021-09-26 stsp (cd $testroot/wt && got update > /dev/null)
1511 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1512 088449d3 2021-09-26 stsp echo "got update failed unexpectedly" >&2
1513 088449d3 2021-09-26 stsp test_done "$testroot" "$ret"
1517 088449d3 2021-09-26 stsp (cd $testroot/wt && got merge -n newbranch \
1518 088449d3 2021-09-26 stsp > $testroot/stdout 2> $testroot/stderr)
1520 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1521 088449d3 2021-09-26 stsp echo "got merge failed unexpectedly" >&2
1522 088449d3 2021-09-26 stsp test_done "$testroot" "1"
1526 088449d3 2021-09-26 stsp echo "G alpha" > $testroot/stdout.expected
1527 088449d3 2021-09-26 stsp echo "Merge of refs/heads/newbranch interrupted on request" \
1528 088449d3 2021-09-26 stsp >> $testroot/stdout.expected
1529 088449d3 2021-09-26 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1531 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1532 088449d3 2021-09-26 stsp diff -u $testroot/stdout.expected $testroot/stdout
1533 088449d3 2021-09-26 stsp test_done "$testroot" "$ret"
1537 088449d3 2021-09-26 stsp (cd $testroot/wt && got status > $testroot/stdout)
1539 088449d3 2021-09-26 stsp echo "M alpha" > $testroot/stdout.expected
1540 088449d3 2021-09-26 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1542 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1543 088449d3 2021-09-26 stsp diff -u $testroot/stdout.expected $testroot/stdout
1544 088449d3 2021-09-26 stsp test_done "$testroot" "$ret"
1548 088449d3 2021-09-26 stsp echo "modified alpha on branch" > $testroot/content.expected
1549 088449d3 2021-09-26 stsp cat $testroot/wt/alpha > $testroot/content
1550 088449d3 2021-09-26 stsp cmp -s $testroot/content.expected $testroot/content
1552 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1553 088449d3 2021-09-26 stsp diff -u $testroot/content.expected $testroot/content
1554 088449d3 2021-09-26 stsp test_done "$testroot" "$ret"
1558 088449d3 2021-09-26 stsp # adjust merge result
1559 088449d3 2021-09-26 stsp echo "adjusted merge result" > $testroot/wt/alpha
1561 088449d3 2021-09-26 stsp # continue the merge
1562 088449d3 2021-09-26 stsp (cd $testroot/wt && got merge -c > $testroot/stdout)
1564 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1565 088449d3 2021-09-26 stsp echo "got merge failed unexpectedly" >&2
1566 088449d3 2021-09-26 stsp test_done "$testroot" "$ret"
1570 088449d3 2021-09-26 stsp local merge_commit=`git_show_head $testroot/repo`
1572 0ff8d236 2021-09-28 stsp echo "M alpha" > $testroot/stdout.expected
1573 088449d3 2021-09-26 stsp echo -n "Merged refs/heads/newbranch into refs/heads/master: " \
1574 0ff8d236 2021-09-28 stsp >> $testroot/stdout.expected
1575 088449d3 2021-09-26 stsp echo $merge_commit >> $testroot/stdout.expected
1577 088449d3 2021-09-26 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1579 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1580 088449d3 2021-09-26 stsp diff -u $testroot/stdout.expected $testroot/stdout
1581 088449d3 2021-09-26 stsp test_done "$testroot" "$ret"
1585 088449d3 2021-09-26 stsp (cd $testroot/wt && got status > $testroot/stdout)
1587 088449d3 2021-09-26 stsp echo -n > $testroot/stdout.expected
1588 088449d3 2021-09-26 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1590 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1591 088449d3 2021-09-26 stsp diff -u $testroot/stdout.expected $testroot/stdout
1592 088449d3 2021-09-26 stsp test_done "$testroot" "$ret"
1596 088449d3 2021-09-26 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1597 088449d3 2021-09-26 stsp echo "commit $merge_commit (master)" > $testroot/stdout.expected
1598 088449d3 2021-09-26 stsp echo "commit $master_commit" >> $testroot/stdout.expected
1599 088449d3 2021-09-26 stsp echo "commit $commit0" >> $testroot/stdout.expected
1600 088449d3 2021-09-26 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1602 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1603 088449d3 2021-09-26 stsp diff -u $testroot/stdout.expected $testroot/stdout
1604 088449d3 2021-09-26 stsp test_done "$testroot" "$ret"
1608 088449d3 2021-09-26 stsp (cd $testroot/wt && got update > $testroot/stdout)
1610 088449d3 2021-09-26 stsp echo 'Already up-to-date' > $testroot/stdout.expected
1611 088449d3 2021-09-26 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1613 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1614 088449d3 2021-09-26 stsp diff -u $testroot/stdout.expected $testroot/stdout
1615 088449d3 2021-09-26 stsp test_done "$testroot" "$ret"
1619 088449d3 2021-09-26 stsp # We should have created a merge commit with two parents.
1620 088449d3 2021-09-26 stsp (cd $testroot/wt && got log -l1 | grep ^parent > $testroot/stdout)
1621 088449d3 2021-09-26 stsp echo "parent 1: $master_commit" > $testroot/stdout.expected
1622 088449d3 2021-09-26 stsp echo "parent 2: $branch_commit0" >> $testroot/stdout.expected
1623 088449d3 2021-09-26 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1625 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1626 088449d3 2021-09-26 stsp diff -u $testroot/stdout.expected $testroot/stdout
1628 088449d3 2021-09-26 stsp test_done "$testroot" "$ret"
1631 b2b3fce1 2022-10-29 op test_merge_umask() {
1632 b2b3fce1 2022-10-29 op local testroot=`test_init merge_umask`
1634 b2b3fce1 2022-10-29 op (cd $testroot/repo && git checkout -q -b newbranch)
1635 b2b3fce1 2022-10-29 op echo "modified alpha on branch" >$testroot/repo/alpha
1636 b2b3fce1 2022-10-29 op git_commit "$testroot/repo" -m "committing alpha on newbranch"
1637 b2b3fce1 2022-10-29 op echo "modified delta on branch" >$testroot/repo/gamma/delta
1638 b2b3fce1 2022-10-29 op git_commit "$testroot/repo" -m "committing delta on newbranch"
1640 b2b3fce1 2022-10-29 op # diverge from newbranch
1641 b2b3fce1 2022-10-29 op (cd "$testroot/repo" && git checkout -q master)
1642 b2b3fce1 2022-10-29 op echo "modified beta on master" >$testroot/repo/beta
1643 b2b3fce1 2022-10-29 op git_commit "$testroot/repo" -m "committing zeto no master"
1645 b2b3fce1 2022-10-29 op got checkout "$testroot/repo" "$testroot/wt" >/dev/null
1647 b2b3fce1 2022-10-29 op # using a subshell to avoid clobbering global umask
1648 b2b3fce1 2022-10-29 op (umask 077 && cd "$testroot/wt" && got merge newbranch) >/dev/null
1650 b2b3fce1 2022-10-29 op for f in alpha gamma/delta; do
1651 b2b3fce1 2022-10-29 op ls -l "$testroot/wt/$f" | grep -q ^-rw-------
1652 b2b3fce1 2022-10-29 op if [ $? -ne 0 ]; then
1653 b2b3fce1 2022-10-29 op echo "$f is not 0600 after merge" >&2
1654 b2b3fce1 2022-10-29 op ls -l "$testroot/wt/$f" >&2
1655 b2b3fce1 2022-10-29 op test_done "$testroot" 1
1659 b2b3fce1 2022-10-29 op test_done "$testroot" 0
1662 d51d11be 2023-02-21 op test_merge_gitconfig_author() {
1663 d51d11be 2023-02-21 op local testroot=`test_init merge_gitconfig_author`
1665 d51d11be 2023-02-21 op (cd $testroot/repo && git config user.name 'Flan Luck')
1666 d51d11be 2023-02-21 op (cd $testroot/repo && git config user.email 'flan_luck@openbsd.org')
1668 d51d11be 2023-02-21 op (cd $testroot/repo && git checkout -q -b newbranch)
1669 d51d11be 2023-02-21 op echo "modified alpha on branch" >$testroot/repo/alpha
1670 d51d11be 2023-02-21 op git_commit "$testroot/repo" -m "committing alpha on newbranch"
1671 d51d11be 2023-02-21 op echo "modified delta on branch" >$testroot/repo/gamma/delta
1672 d51d11be 2023-02-21 op git_commit "$testroot/repo" -m "committing delta on newbranch"
1674 d51d11be 2023-02-21 op # diverge from newbranch
1675 d51d11be 2023-02-21 op (cd "$testroot/repo" && git checkout -q master)
1676 d51d11be 2023-02-21 op echo "modified beta on master" >$testroot/repo/beta
1677 d51d11be 2023-02-21 op git_commit "$testroot/repo" -m "committing zeto no master"
1679 d51d11be 2023-02-21 op got checkout "$testroot/repo" "$testroot/wt" >/dev/null
1681 d51d11be 2023-02-21 op # unset in a subshell to avoid affecting our environment
1682 d51d11be 2023-02-21 op (unset GOT_IGNORE_GITCONFIG && cd $testroot/wt && \
1683 d51d11be 2023-02-21 op got merge newbranch > /dev/null)
1685 d51d11be 2023-02-21 op (cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
1687 d51d11be 2023-02-21 op if [ $ret -ne 0 ]; then
1688 d51d11be 2023-02-21 op test_done "$testroot" "$ret"
1692 d51d11be 2023-02-21 op echo "from: Flan Luck <flan_luck@openbsd.org>" \
1693 d51d11be 2023-02-21 op > $testroot/stdout.expected
1694 d51d11be 2023-02-21 op cmp -s $testroot/stdout.expected $testroot/stdout
1696 d51d11be 2023-02-21 op if [ $ret -ne 0 ]; then
1697 d51d11be 2023-02-21 op diff -u $testroot/stdout.expected $testroot/stdout
1699 d51d11be 2023-02-21 op test_done "$testroot" "$ret"
1702 13342307 2023-06-21 stsp test_merge_fetched_branch() {
1703 13342307 2023-06-21 stsp local testroot=`test_init merge_fetched_branch`
1704 13342307 2023-06-21 stsp local testurl=ssh://127.0.0.1/$testroot
1705 13342307 2023-06-21 stsp local commit_id=`git_show_head $testroot/repo`
1707 13342307 2023-06-21 stsp got clone -q $testurl/repo $testroot/repo-clone
1709 13342307 2023-06-21 stsp if [ $ret -ne 0 ]; then
1710 13342307 2023-06-21 stsp echo "got clone command failed unexpectedly" >&2
1711 13342307 2023-06-21 stsp test_done "$testroot" "$ret"
1715 13342307 2023-06-21 stsp echo "modified alpha" > $testroot/repo/alpha
1716 13342307 2023-06-21 stsp git_commit $testroot/repo -m "modified alpha"
1717 13342307 2023-06-21 stsp local commit_id2=`git_show_head $testroot/repo`
1719 13342307 2023-06-21 stsp got fetch -q -r $testroot/repo-clone > $testroot/stdout
1721 13342307 2023-06-21 stsp if [ $ret -ne 0 ]; then
1722 13342307 2023-06-21 stsp echo "got fetch command failed unexpectedly" >&2
1723 13342307 2023-06-21 stsp test_done "$testroot" "$ret"
1727 13342307 2023-06-21 stsp echo -n > $testroot/stdout.expected
1729 13342307 2023-06-21 stsp cmp -s $testroot/stdout $testroot/stdout.expected
1731 13342307 2023-06-21 stsp if [ $ret -ne 0 ]; then
1732 13342307 2023-06-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1733 13342307 2023-06-21 stsp test_done "$testroot" "$ret"
1737 13342307 2023-06-21 stsp got ref -l -r $testroot/repo-clone > $testroot/stdout
1739 13342307 2023-06-21 stsp echo "HEAD: refs/heads/master" > $testroot/stdout.expected
1740 13342307 2023-06-21 stsp echo "refs/heads/master: $commit_id" >> $testroot/stdout.expected
1741 13342307 2023-06-21 stsp echo "refs/remotes/origin/HEAD: refs/remotes/origin/master" \
1742 13342307 2023-06-21 stsp >> $testroot/stdout.expected
1743 13342307 2023-06-21 stsp echo "refs/remotes/origin/master: $commit_id2" \
1744 13342307 2023-06-21 stsp >> $testroot/stdout.expected
1746 13342307 2023-06-21 stsp cmp -s $testroot/stdout $testroot/stdout.expected
1748 13342307 2023-06-21 stsp if [ $ret -ne 0 ]; then
1749 13342307 2023-06-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1750 13342307 2023-06-21 stsp test_done "$testroot" "$ret"
1754 13342307 2023-06-21 stsp got checkout $testroot/repo-clone $testroot/wt > /dev/null
1756 13342307 2023-06-21 stsp echo "modified beta" > $testroot/wt/beta
1757 13342307 2023-06-21 stsp (cd $testroot/wt && got commit -m "modified beta" > /dev/null)
1758 13342307 2023-06-21 stsp local commit_id3=`git_show_head $testroot/repo-clone`
1760 13342307 2023-06-21 stsp (cd $testroot/wt && got update > /dev/null)
1761 13342307 2023-06-21 stsp (cd $testroot/wt && got merge origin/master > $testroot/stdout)
1762 13342307 2023-06-21 stsp local merge_commit_id=`git_show_head $testroot/repo-clone`
1764 13342307 2023-06-21 stsp cat > $testroot/stdout.expected <<EOF
1766 13342307 2023-06-21 stsp Merged refs/remotes/origin/master into refs/heads/master: $merge_commit_id
1769 13342307 2023-06-21 stsp cmp -s $testroot/stdout $testroot/stdout.expected
1771 13342307 2023-06-21 stsp if [ $ret -ne 0 ]; then
1772 13342307 2023-06-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1774 13342307 2023-06-21 stsp test_done "$testroot" "$ret"
1777 13342307 2023-06-21 stsp test_merge_fetched_branch_remote() {
1778 13342307 2023-06-21 stsp local testroot=`test_init merge_fetched_branch_remote`
1779 13342307 2023-06-21 stsp local testurl=ssh://127.0.0.1/$testroot
1780 13342307 2023-06-21 stsp local commit_id=`git_show_head $testroot/repo`
1782 13342307 2023-06-21 stsp got clone -q $testurl/repo $testroot/repo-clone
1784 13342307 2023-06-21 stsp if [ $ret -ne 0 ]; then
1785 13342307 2023-06-21 stsp echo "got clone command failed unexpectedly" >&2
1786 13342307 2023-06-21 stsp test_done "$testroot" "$ret"
1790 13342307 2023-06-21 stsp echo "modified alpha" > $testroot/repo/alpha
1791 13342307 2023-06-21 stsp git_commit $testroot/repo -m "modified alpha"
1792 13342307 2023-06-21 stsp local commit_id2=`git_show_head $testroot/repo`
1794 13342307 2023-06-21 stsp got fetch -q -r $testroot/repo-clone > $testroot/stdout
1796 13342307 2023-06-21 stsp if [ $ret -ne 0 ]; then
1797 13342307 2023-06-21 stsp echo "got fetch command failed unexpectedly" >&2
1798 13342307 2023-06-21 stsp test_done "$testroot" "$ret"
1802 13342307 2023-06-21 stsp echo -n > $testroot/stdout.expected
1804 13342307 2023-06-21 stsp cmp -s $testroot/stdout $testroot/stdout.expected
1806 13342307 2023-06-21 stsp if [ $ret -ne 0 ]; then
1807 13342307 2023-06-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1808 13342307 2023-06-21 stsp test_done "$testroot" "$ret"
1812 13342307 2023-06-21 stsp got ref -l -r $testroot/repo-clone > $testroot/stdout
1814 13342307 2023-06-21 stsp echo "HEAD: refs/heads/master" > $testroot/stdout.expected
1815 13342307 2023-06-21 stsp echo "refs/heads/master: $commit_id" >> $testroot/stdout.expected
1816 13342307 2023-06-21 stsp echo "refs/remotes/origin/HEAD: refs/remotes/origin/master" \
1817 13342307 2023-06-21 stsp >> $testroot/stdout.expected
1818 13342307 2023-06-21 stsp echo "refs/remotes/origin/master: $commit_id2" \
1819 13342307 2023-06-21 stsp >> $testroot/stdout.expected
1821 13342307 2023-06-21 stsp cmp -s $testroot/stdout $testroot/stdout.expected
1823 13342307 2023-06-21 stsp if [ $ret -ne 0 ]; then
1824 13342307 2023-06-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1825 13342307 2023-06-21 stsp test_done "$testroot" "$ret"
1829 13342307 2023-06-21 stsp got checkout $testroot/repo-clone $testroot/wt > /dev/null
1831 13342307 2023-06-21 stsp echo "modified beta" > $testroot/wt/beta
1832 13342307 2023-06-21 stsp (cd $testroot/wt && got commit -m "modified beta" > /dev/null)
1833 13342307 2023-06-21 stsp local commit_id3=`git_show_head $testroot/repo-clone`
1835 13342307 2023-06-21 stsp (cd $testroot/wt && got update -b origin/master > /dev/null)
1836 13342307 2023-06-21 stsp (cd $testroot/wt && got merge master > \
1837 13342307 2023-06-21 stsp $testroot/stdout 2> $testroot/stderr)
1838 13342307 2023-06-21 stsp local merge_commit_id=`git_show_head $testroot/repo-clone`
1840 13342307 2023-06-21 stsp echo -n > $testroot/stdout.expected
1842 13342307 2023-06-21 stsp cmp -s $testroot/stdout $testroot/stdout.expected
1844 13342307 2023-06-21 stsp if [ $ret -ne 0 ]; then
1845 13342307 2023-06-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1846 13342307 2023-06-21 stsp test_done "$testroot" "$ret"
1850 13342307 2023-06-21 stsp echo -n "got: work tree's current branch refs/remotes/origin/master " \
1851 13342307 2023-06-21 stsp > $testroot/stderr.expected
1852 13342307 2023-06-21 stsp echo -n 'is outside the "refs/heads/" reference namespace; ' \
1853 13342307 2023-06-21 stsp >> $testroot/stderr.expected
1854 13342307 2023-06-21 stsp echo -n "update -b required: will not commit to a branch " \
1855 13342307 2023-06-21 stsp >> $testroot/stderr.expected
1856 13342307 2023-06-21 stsp echo 'outside the "refs/heads/" reference namespace' \
1857 13342307 2023-06-21 stsp >> $testroot/stderr.expected
1859 13342307 2023-06-21 stsp cmp -s $testroot/stderr $testroot/stderr.expected
1861 13342307 2023-06-21 stsp if [ $ret -ne 0 ]; then
1862 13342307 2023-06-21 stsp diff -u $testroot/stderr.expected $testroot/stderr
1864 13342307 2023-06-21 stsp test_done "$testroot" "$ret"
1867 f259c4c1 2021-09-24 stsp test_parseargs "$@"
1868 f259c4c1 2021-09-24 stsp run_test test_merge_basic
1869 179f9db0 2023-06-20 falsifian run_test test_merge_forward
1870 179f9db0 2023-06-20 falsifian run_test test_merge_backward
1871 f259c4c1 2021-09-24 stsp run_test test_merge_continue
1872 6b5246e4 2023-06-05 stsp run_test test_merge_continue_new_commit
1873 f259c4c1 2021-09-24 stsp run_test test_merge_abort
1874 f259c4c1 2021-09-24 stsp run_test test_merge_in_progress
1875 f259c4c1 2021-09-24 stsp run_test test_merge_path_prefix
1876 f259c4c1 2021-09-24 stsp run_test test_merge_missing_file
1877 a6a8f8bb 2021-09-24 stsp run_test test_merge_no_op
1878 4e91ef15 2021-09-26 stsp run_test test_merge_imported_branch
1879 088449d3 2021-09-26 stsp run_test test_merge_interrupt
1880 b2b3fce1 2022-10-29 op run_test test_merge_umask
1881 d51d11be 2023-02-21 op run_test test_merge_gitconfig_author
1882 13342307 2023-06-21 stsp run_test test_merge_fetched_branch
1883 13342307 2023-06-21 stsp run_test test_merge_fetched_branch_remote
