3 5aa81393 2020-01-06 stsp # Copyright (c) 2019, 2020 Stefan Sperling <stsp@openbsd.org>
5 818c7501 2019-07-11 stsp # Permission to use, copy, modify, and distribute this software for any
6 818c7501 2019-07-11 stsp # purpose with or without fee is hereby granted, provided that the above
7 818c7501 2019-07-11 stsp # copyright notice and this permission notice appear in all copies.
9 818c7501 2019-07-11 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 818c7501 2019-07-11 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 818c7501 2019-07-11 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 818c7501 2019-07-11 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 818c7501 2019-07-11 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 818c7501 2019-07-11 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 818c7501 2019-07-11 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 818c7501 2019-07-11 stsp . ./common.sh
19 f6cae3ed 2020-09-13 naddy test_rebase_basic() {
20 818c7501 2019-07-11 stsp local testroot=`test_init rebase_basic`
21 e600f124 2021-03-21 stsp local commit0=`git_show_head $testroot/repo`
22 e600f124 2021-03-21 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
24 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
25 818c7501 2019-07-11 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
26 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
28 818c7501 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
29 818c7501 2019-07-11 stsp (cd $testroot/repo && git rm -q beta)
30 818c7501 2019-07-11 stsp echo "new file on branch" > $testroot/repo/epsilon/new
31 818c7501 2019-07-11 stsp (cd $testroot/repo && git add epsilon/new)
32 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing more changes on newbranch"
34 818c7501 2019-07-11 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
35 818c7501 2019-07-11 stsp local orig_commit2=`git_show_head $testroot/repo`
36 e600f124 2021-03-21 stsp local orig_author_time2=`git_show_author_time $testroot/repo`
38 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
39 818c7501 2019-07-11 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
40 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to zeta on master"
41 818c7501 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
43 818c7501 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
45 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
46 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
50 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout)
52 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
53 818c7501 2019-07-11 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
54 818c7501 2019-07-11 stsp local new_commit2=`git_show_head $testroot/repo`
55 e600f124 2021-03-21 stsp local new_author_time2=`git_show_author_time $testroot/repo`
57 818c7501 2019-07-11 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
58 818c7501 2019-07-11 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
59 818c7501 2019-07-11 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
60 818c7501 2019-07-11 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
62 818c7501 2019-07-11 stsp echo "G gamma/delta" >> $testroot/stdout.expected
63 818c7501 2019-07-11 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
64 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
65 818c7501 2019-07-11 stsp echo ": committing to delta on newbranch" >> $testroot/stdout.expected
66 818c7501 2019-07-11 stsp echo "G alpha" >> $testroot/stdout.expected
67 818c7501 2019-07-11 stsp echo "D beta" >> $testroot/stdout.expected
68 818c7501 2019-07-11 stsp echo "A epsilon/new" >> $testroot/stdout.expected
69 818c7501 2019-07-11 stsp echo -n "$short_orig_commit2 -> $short_new_commit2" \
70 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
71 818c7501 2019-07-11 stsp echo ": committing more changes on newbranch" \
72 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
73 818c7501 2019-07-11 stsp echo "Switching work tree to refs/heads/newbranch" \
74 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
76 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
78 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
79 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
80 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
84 818c7501 2019-07-11 stsp echo "modified delta on branch" > $testroot/content.expected
85 818c7501 2019-07-11 stsp cat $testroot/wt/gamma/delta > $testroot/content
86 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
88 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
89 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
90 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
94 818c7501 2019-07-11 stsp echo "modified alpha on branch" > $testroot/content.expected
95 818c7501 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
96 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
98 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
99 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
100 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
104 818c7501 2019-07-11 stsp if [ -e $testroot/wt/beta ]; then
105 818c7501 2019-07-11 stsp echo "removed file beta still exists on disk" >&2
106 818c7501 2019-07-11 stsp test_done "$testroot" "1"
110 818c7501 2019-07-11 stsp echo "new file on branch" > $testroot/content.expected
111 818c7501 2019-07-11 stsp cat $testroot/wt/epsilon/new > $testroot/content
112 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
114 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
115 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
116 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
120 818c7501 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
122 818c7501 2019-07-11 stsp echo -n > $testroot/stdout.expected
123 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
125 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
126 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
127 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
131 818c7501 2019-07-11 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
132 818c7501 2019-07-11 stsp echo "commit $new_commit2 (newbranch)" > $testroot/stdout.expected
133 818c7501 2019-07-11 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
134 818c7501 2019-07-11 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
135 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
137 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
138 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
139 a615e0e7 2020-12-16 stsp test_done "$testroot" "$ret"
143 a615e0e7 2020-12-16 stsp (cd $testroot/wt && got update > $testroot/stdout)
145 a615e0e7 2020-12-16 stsp echo 'Already up-to-date' > $testroot/stdout.expected
146 a615e0e7 2020-12-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
148 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
149 a615e0e7 2020-12-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
150 e600f124 2021-03-21 stsp test_done "$testroot" "$ret"
154 e600f124 2021-03-21 stsp # We should have a backup of old commits
155 e600f124 2021-03-21 stsp (cd $testroot/repo && got rebase -l > $testroot/stdout)
156 fa37079f 2021-10-09 thomas local prev_LC_TIME="$LC_TIME"
157 fa37079f 2021-10-09 thomas export LC_TIME=C
158 fa37079f 2021-10-09 thomas d_orig2=`date -u -d "@$orig_author_time2" +"%a %b %e %X %Y UTC"`
159 fa37079f 2021-10-09 thomas export LC_TIME="$prev_LC_TIME"
160 180f111d 2021-09-21 thomas.ad d_new2=`date -u -d "@$new_author_time2" +"%G-%m-%d"`
161 180f111d 2021-09-21 thomas.ad d_0=`date -u -d "@$commit0_author_time" +"%G-%m-%d"`
162 e600f124 2021-03-21 stsp cat > $testroot/stdout.expected <<EOF
163 e600f124 2021-03-21 stsp -----------------------------------------------
164 e600f124 2021-03-21 stsp commit $orig_commit2 (formerly newbranch)
165 e600f124 2021-03-21 stsp from: $GOT_AUTHOR
166 e600f124 2021-03-21 stsp date: $d_orig2
168 e600f124 2021-03-21 stsp committing more changes on newbranch
170 e600f124 2021-03-21 stsp has become commit $new_commit2 (newbranch)
171 e600f124 2021-03-21 stsp $d_new2 $GOT_AUTHOR_11 committing more changes on newbranch
172 e600f124 2021-03-21 stsp history forked at $commit0
173 e600f124 2021-03-21 stsp $d_0 $GOT_AUTHOR_11 adding the test tree
175 e600f124 2021-03-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
177 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
178 e600f124 2021-03-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
179 9e822917 2021-03-23 stsp test_done "$testroot" "$ret"
183 9e822917 2021-03-23 stsp # Asking for backups of a branch which has none should yield an error
184 9e822917 2021-03-23 stsp (cd $testroot/repo && got rebase -l master \
185 9e822917 2021-03-23 stsp > $testroot/stdout 2> $testroot/stderr)
186 9e822917 2021-03-23 stsp echo -n > $testroot/stdout.expected
187 9e822917 2021-03-23 stsp echo "got: refs/got/backup/rebase/master/: no such reference found" \
188 9e822917 2021-03-23 stsp > $testroot/stderr.expected
189 9e822917 2021-03-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
191 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
192 9e822917 2021-03-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
193 9e822917 2021-03-23 stsp test_done "$testroot" "$ret"
196 9e822917 2021-03-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
198 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
199 9e822917 2021-03-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
200 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
204 643b85bc 2021-07-16 stsp # Delete all backup refs
205 643b85bc 2021-07-16 stsp (cd $testroot/repo && got rebase -X \
206 643b85bc 2021-07-16 stsp > $testroot/stdout 2> $testroot/stderr)
207 643b85bc 2021-07-16 stsp echo -n "Deleted refs/got/backup/rebase/newbranch/$new_commit2: " \
208 643b85bc 2021-07-16 stsp > $testroot/stdout.expected
209 643b85bc 2021-07-16 stsp echo "$orig_commit2" >> $testroot/stdout.expected
210 643b85bc 2021-07-16 stsp echo -n > $testroot/stderr.expected
211 643b85bc 2021-07-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
213 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
214 643b85bc 2021-07-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
215 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
218 643b85bc 2021-07-16 stsp cmp -s $testroot/stderr.expected $testroot/stderr
220 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
221 643b85bc 2021-07-16 stsp diff -u $testroot/stderr.expected $testroot/stderr
222 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
226 643b85bc 2021-07-16 stsp (cd $testroot/repo && got rebase -l > $testroot/stdout)
227 643b85bc 2021-07-16 stsp echo -n > $testroot/stdout.expected
228 643b85bc 2021-07-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
230 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
231 643b85bc 2021-07-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
233 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
236 f6cae3ed 2020-09-13 naddy test_rebase_ancestry_check() {
237 818c7501 2019-07-11 stsp local testroot=`test_init rebase_ancestry_check`
239 818c7501 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
241 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
242 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
246 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
247 818c7501 2019-07-11 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
248 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
249 82d979c5 2021-11-04 thomas local newbranch_id=`git_show_head $testroot/repo`
251 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
252 818c7501 2019-07-11 stsp 2> $testroot/stderr)
254 82d979c5 2021-11-04 thomas echo "refs/heads/newbranch is already based on refs/heads/master" \
255 82d979c5 2021-11-04 thomas > $testroot/stdout.expected
256 82d979c5 2021-11-04 thomas echo "Switching work tree from refs/heads/master to refs/heads/newbranch" \
257 82d979c5 2021-11-04 thomas >> $testroot/stdout.expected
258 82d979c5 2021-11-04 thomas echo "U gamma/delta" >> $testroot/stdout.expected
259 82d979c5 2021-11-04 thomas echo "Updated to refs/heads/newbranch: ${newbranch_id}" \
260 82d979c5 2021-11-04 thomas >> $testroot/stdout.expected
261 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
263 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
264 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
265 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
269 82d979c5 2021-11-04 thomas echo -n > $testroot/stderr.expected
270 818c7501 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
272 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
273 818c7501 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
275 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
278 f6cae3ed 2020-09-13 naddy test_rebase_continue() {
279 818c7501 2019-07-11 stsp local testroot=`test_init rebase_continue`
280 f69721c3 2019-10-21 stsp local init_commit=`git_show_head $testroot/repo`
282 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
283 818c7501 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
284 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
285 818c7501 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
286 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
288 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
289 818c7501 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
290 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
291 818c7501 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
293 818c7501 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
295 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
296 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
300 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
301 818c7501 2019-07-11 stsp 2> $testroot/stderr)
303 818c7501 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
304 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
305 a0ea4fc0 2020-02-28 stsp echo -n "$short_orig_commit1 -> merge conflict" \
306 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
307 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
308 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
310 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
311 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
312 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
316 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
317 818c7501 2019-07-11 stsp > $testroot/stderr.expected
318 818c7501 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
320 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
321 818c7501 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
322 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
326 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
327 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
328 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $init_commit" \
329 f69721c3 2019-10-21 stsp >> $testroot/content.expected
330 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
331 818c7501 2019-07-11 stsp echo "=======" >> $testroot/content.expected
332 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
333 54d5be07 2021-06-03 stsp echo ">>>>>>> merged change: commit $orig_commit1" \
334 54d5be07 2021-06-03 stsp >> $testroot/content.expected
335 818c7501 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
336 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
338 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
339 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
340 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
344 818c7501 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
346 818c7501 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
347 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
349 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
350 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
351 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
355 818c7501 2019-07-11 stsp # resolve the conflict
356 818c7501 2019-07-11 stsp echo "modified alpha on branch and master" > $testroot/wt/alpha
358 f032f1f7 2019-08-04 stsp # test interaction of 'got stage' and rebase -c
359 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got stage alpha > /dev/null)
360 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got rebase -c > $testroot/stdout \
361 f032f1f7 2019-08-04 stsp 2> $testroot/stderr)
363 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
364 f032f1f7 2019-08-04 stsp echo "rebase succeeded unexpectedly" >&2
365 f032f1f7 2019-08-04 stsp test_done "$testroot" "1"
368 f032f1f7 2019-08-04 stsp echo -n "got: work tree contains files with staged changes; " \
369 f032f1f7 2019-08-04 stsp > $testroot/stderr.expected
370 f032f1f7 2019-08-04 stsp echo "these changes must be committed or unstaged first" \
371 f032f1f7 2019-08-04 stsp >> $testroot/stderr.expected
372 f032f1f7 2019-08-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
374 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
375 f032f1f7 2019-08-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
376 f032f1f7 2019-08-04 stsp test_done "$testroot" "$ret"
380 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got unstage alpha > /dev/null)
381 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase -c > $testroot/stdout)
383 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
384 818c7501 2019-07-11 stsp local new_commit1=`git_show_head $testroot/repo`
385 818c7501 2019-07-11 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
387 818c7501 2019-07-11 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
388 818c7501 2019-07-11 stsp > $testroot/stdout.expected
389 818c7501 2019-07-11 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
390 818c7501 2019-07-11 stsp echo "Switching work tree to refs/heads/newbranch" \
391 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
393 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
395 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
396 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
397 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
402 818c7501 2019-07-11 stsp (cd $testroot/wt && got log -l2 | grep ^commit > $testroot/stdout)
403 818c7501 2019-07-11 stsp echo "commit $new_commit1 (newbranch)" > $testroot/stdout.expected
404 818c7501 2019-07-11 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
405 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
407 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
408 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
410 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
413 f6cae3ed 2020-09-13 naddy test_rebase_abort() {
414 818c7501 2019-07-11 stsp local testroot=`test_init rebase_abort`
416 818c7501 2019-07-11 stsp local init_commit=`git_show_head $testroot/repo`
418 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
419 818c7501 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
420 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
421 818c7501 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
422 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
424 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
425 818c7501 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
426 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
427 818c7501 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
429 818c7501 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
431 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
432 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
436 d52bac28 2021-10-08 thomas # unrelated unversioned file in work tree
437 d52bac28 2021-10-08 thomas touch $testroot/wt/unversioned-file
439 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
440 818c7501 2019-07-11 stsp 2> $testroot/stderr)
442 818c7501 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
443 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
444 a0ea4fc0 2020-02-28 stsp echo -n "$short_orig_commit1 -> merge conflict" \
445 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
446 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
447 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
449 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
450 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
451 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
455 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
456 818c7501 2019-07-11 stsp > $testroot/stderr.expected
457 818c7501 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
459 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
460 818c7501 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
461 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
465 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
466 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
467 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $init_commit" \
468 f69721c3 2019-10-21 stsp >> $testroot/content.expected
469 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
470 818c7501 2019-07-11 stsp echo "=======" >> $testroot/content.expected
471 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
472 54d5be07 2021-06-03 stsp echo ">>>>>>> merged change: commit $orig_commit1" \
473 54d5be07 2021-06-03 stsp >> $testroot/content.expected
474 818c7501 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
475 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
477 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
478 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
479 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
483 818c7501 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
485 818c7501 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
486 d52bac28 2021-10-08 thomas echo "? unversioned-file" >> $testroot/stdout.expected
487 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
489 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
490 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
491 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
495 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase -a > $testroot/stdout)
497 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
499 818c7501 2019-07-11 stsp echo "Switching work tree to refs/heads/master" \
500 818c7501 2019-07-11 stsp > $testroot/stdout.expected
501 818c7501 2019-07-11 stsp echo 'R alpha' >> $testroot/stdout.expected
502 818c7501 2019-07-11 stsp echo "Rebase of refs/heads/newbranch aborted" \
503 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
505 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
507 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
508 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
509 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
513 818c7501 2019-07-11 stsp echo "modified alpha on master" > $testroot/content.expected
514 818c7501 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
515 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
517 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
518 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
519 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
523 818c7501 2019-07-11 stsp (cd $testroot/wt && got log -l3 -c newbranch \
524 818c7501 2019-07-11 stsp | grep ^commit > $testroot/stdout)
525 818c7501 2019-07-11 stsp echo "commit $orig_commit1 (newbranch)" > $testroot/stdout.expected
526 818c7501 2019-07-11 stsp echo "commit $init_commit" >> $testroot/stdout.expected
527 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
529 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
530 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
532 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
535 f6cae3ed 2020-09-13 naddy test_rebase_no_op_change() {
536 ff0d2220 2019-07-11 stsp local testroot=`test_init rebase_no_op_change`
537 ff0d2220 2019-07-11 stsp local init_commit=`git_show_head $testroot/repo`
539 ff0d2220 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
540 ff0d2220 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
541 ff0d2220 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
542 ff0d2220 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
543 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
545 ff0d2220 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
546 ff0d2220 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
547 ff0d2220 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
548 ff0d2220 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
550 ff0d2220 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
552 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
553 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
557 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
558 ff0d2220 2019-07-11 stsp 2> $testroot/stderr)
560 ff0d2220 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
561 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
562 a0ea4fc0 2020-02-28 stsp echo -n "$short_orig_commit1 -> merge conflict" \
563 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
564 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
565 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
567 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
568 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
569 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
573 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
574 ff0d2220 2019-07-11 stsp > $testroot/stderr.expected
575 ff0d2220 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
577 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
578 ff0d2220 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
579 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
583 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
584 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
585 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $init_commit" \
586 f69721c3 2019-10-21 stsp >> $testroot/content.expected
587 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
588 ff0d2220 2019-07-11 stsp echo "=======" >> $testroot/content.expected
589 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
590 54d5be07 2021-06-03 stsp echo ">>>>>>> merged change: commit $orig_commit1" \
591 54d5be07 2021-06-03 stsp >> $testroot/content.expected
592 ff0d2220 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
593 ff0d2220 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
595 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
596 ff0d2220 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
597 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
601 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
603 ff0d2220 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
604 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
606 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
607 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
608 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
612 ff0d2220 2019-07-11 stsp # resolve the conflict
613 ff0d2220 2019-07-11 stsp echo "modified alpha on master" > $testroot/wt/alpha
615 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got rebase -c > $testroot/stdout)
617 ff0d2220 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
618 ff0d2220 2019-07-11 stsp local new_commit1=`git_show_head $testroot/repo`
620 ff0d2220 2019-07-11 stsp echo -n "$short_orig_commit1 -> no-op change" \
621 ff0d2220 2019-07-11 stsp > $testroot/stdout.expected
622 ff0d2220 2019-07-11 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
623 ff0d2220 2019-07-11 stsp echo "Switching work tree to refs/heads/newbranch" \
624 ff0d2220 2019-07-11 stsp >> $testroot/stdout.expected
626 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
628 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
629 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
630 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
635 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got log -l2 | grep ^commit > $testroot/stdout)
636 ff0d2220 2019-07-11 stsp echo "commit $master_commit (master, newbranch)" \
637 ff0d2220 2019-07-11 stsp > $testroot/stdout.expected
638 ff0d2220 2019-07-11 stsp echo "commit $init_commit" >> $testroot/stdout.expected
639 7d5807f4 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
641 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
642 7d5807f4 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
644 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
647 f6cae3ed 2020-09-13 naddy test_rebase_in_progress() {
648 4ba9c4f6 2019-07-11 stsp local testroot=`test_init rebase_in_progress`
649 7d5807f4 2019-07-11 stsp local init_commit=`git_show_head $testroot/repo`
651 7d5807f4 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
652 7d5807f4 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
653 7d5807f4 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
654 7d5807f4 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
655 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
657 7d5807f4 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
658 7d5807f4 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
659 7d5807f4 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
660 7d5807f4 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
662 7d5807f4 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
664 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
665 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
669 7d5807f4 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
670 7d5807f4 2019-07-11 stsp 2> $testroot/stderr)
672 7d5807f4 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
673 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
674 a0ea4fc0 2020-02-28 stsp echo -n "$short_orig_commit1 -> merge conflict" \
675 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
676 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
677 7d5807f4 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
679 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
680 7d5807f4 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
681 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
685 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
686 7d5807f4 2019-07-11 stsp > $testroot/stderr.expected
687 7d5807f4 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
689 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
690 7d5807f4 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
691 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
695 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
696 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
697 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $init_commit" \
698 f69721c3 2019-10-21 stsp >> $testroot/content.expected
699 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
700 7d5807f4 2019-07-11 stsp echo "=======" >> $testroot/content.expected
701 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
702 54d5be07 2021-06-03 stsp echo ">>>>>>> merged change: commit $orig_commit1" \
703 54d5be07 2021-06-03 stsp >> $testroot/content.expected
704 7d5807f4 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
705 7d5807f4 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
707 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
708 7d5807f4 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
709 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
713 7d5807f4 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
715 7d5807f4 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
716 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
718 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
719 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
720 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
724 7d5807f4 2019-07-11 stsp for cmd in update commit; do
725 7d5807f4 2019-07-11 stsp (cd $testroot/wt && got $cmd > $testroot/stdout \
726 7d5807f4 2019-07-11 stsp 2> $testroot/stderr)
728 7d5807f4 2019-07-11 stsp echo -n > $testroot/stdout.expected
729 7d5807f4 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
731 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
732 7d5807f4 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
733 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
737 7d5807f4 2019-07-11 stsp echo -n "got: a rebase operation is in progress in this " \
738 7d5807f4 2019-07-11 stsp > $testroot/stderr.expected
739 7d5807f4 2019-07-11 stsp echo "work tree and must be continued or aborted first" \
740 7d5807f4 2019-07-11 stsp >> $testroot/stderr.expected
741 7d5807f4 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
743 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
744 7d5807f4 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
745 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
750 64c6d990 2019-07-11 stsp test_done "$testroot" "$ret"
753 f6cae3ed 2020-09-13 naddy test_rebase_path_prefix() {
754 64c6d990 2019-07-11 stsp local testroot=`test_init rebase_path_prefix`
756 64c6d990 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
757 64c6d990 2019-07-11 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
758 64c6d990 2019-07-11 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
760 64c6d990 2019-07-11 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
761 64c6d990 2019-07-11 stsp local orig_commit2=`git_show_head $testroot/repo`
763 64c6d990 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
764 64c6d990 2019-07-11 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
765 64c6d990 2019-07-11 stsp git_commit $testroot/repo -m "committing to zeta on master"
766 64c6d990 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
768 64c6d990 2019-07-11 stsp got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
770 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
771 64c6d990 2019-07-11 stsp test_done "$testroot" "$ret"
775 64c6d990 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch \
776 64c6d990 2019-07-11 stsp > $testroot/stdout 2> $testroot/stderr)
778 64c6d990 2019-07-11 stsp echo -n > $testroot/stdout.expected
779 64c6d990 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
781 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
782 64c6d990 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
783 64c6d990 2019-07-11 stsp test_done "$testroot" "$ret"
787 64c6d990 2019-07-11 stsp echo -n "got: cannot rebase branch which contains changes outside " \
788 64c6d990 2019-07-11 stsp > $testroot/stderr.expected
789 64c6d990 2019-07-11 stsp echo "of this work tree's path prefix" >> $testroot/stderr.expected
790 787c8eb6 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
792 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
793 787c8eb6 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
794 f4a34a66 2022-04-16 thomas test_done "$testroot" "$ret"
798 f4a34a66 2022-04-16 thomas # rebase should succeed when using a complete work tree
799 f4a34a66 2022-04-16 thomas got checkout $testroot/repo $testroot/wt2 > /dev/null
801 f4a34a66 2022-04-16 thomas if [ $ret -ne 0 ]; then
802 f4a34a66 2022-04-16 thomas test_done "$testroot" "$ret"
806 f4a34a66 2022-04-16 thomas (cd $testroot/wt2 && got rebase newbranch \
807 f4a34a66 2022-04-16 thomas > $testroot/stdout 2> $testroot/stderr)
809 f4a34a66 2022-04-16 thomas (cd $testroot/repo && git checkout -q newbranch)
810 f4a34a66 2022-04-16 thomas local new_commit1=`git_show_parent_commit $testroot/repo`
811 f4a34a66 2022-04-16 thomas local new_commit2=`git_show_head $testroot/repo`
813 f4a34a66 2022-04-16 thomas local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
814 f4a34a66 2022-04-16 thomas local short_new_commit2=`trim_obj_id 28 $new_commit2`
816 f4a34a66 2022-04-16 thomas echo "G gamma/delta" > $testroot/stdout.expected
817 f4a34a66 2022-04-16 thomas echo -n "$short_orig_commit2 -> $short_new_commit2" \
818 f4a34a66 2022-04-16 thomas >> $testroot/stdout.expected
819 f4a34a66 2022-04-16 thomas echo ": committing to delta on newbranch" \
820 f4a34a66 2022-04-16 thomas >> $testroot/stdout.expected
821 f4a34a66 2022-04-16 thomas echo "Switching work tree to refs/heads/newbranch" \
822 f4a34a66 2022-04-16 thomas >> $testroot/stdout.expected
824 f4a34a66 2022-04-16 thomas cmp -s $testroot/stdout.expected $testroot/stdout
826 f4a34a66 2022-04-16 thomas if [ $ret -ne 0 ]; then
827 f4a34a66 2022-04-16 thomas diff -u $testroot/stdout.expected $testroot/stdout
828 f4a34a66 2022-04-16 thomas test_done "$testroot" "$ret"
832 f4a34a66 2022-04-16 thomas # the first work tree should remain usable
833 f4a34a66 2022-04-16 thomas (cd $testroot/wt && got update -b master \
834 f4a34a66 2022-04-16 thomas > $testroot/stdout 2> $testroot/stderr)
836 f4a34a66 2022-04-16 thomas if [ $ret -ne 0 ]; then
837 f4a34a66 2022-04-16 thomas echo "update failed unexpectedly" >&2
838 f4a34a66 2022-04-16 thomas test_done "$testroot" "1"
842 f4a34a66 2022-04-16 thomas echo 'Already up-to-date' > $testroot/stdout.expected
843 f4a34a66 2022-04-16 thomas cmp -s $testroot/stdout.expected $testroot/stdout
845 f4a34a66 2022-04-16 thomas if [ $ret -ne 0 ]; then
846 f4a34a66 2022-04-16 thomas diff -u $testroot/stdout.expected $testroot/stdout
848 787c8eb6 2019-07-11 stsp test_done "$testroot" "$ret"
851 f6cae3ed 2020-09-13 naddy test_rebase_preserves_logmsg() {
852 787c8eb6 2019-07-11 stsp local testroot=`test_init rebase_preserves_logmsg`
854 787c8eb6 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
855 787c8eb6 2019-07-11 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
856 787c8eb6 2019-07-11 stsp git_commit $testroot/repo -m "modified delta on newbranch"
858 787c8eb6 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
859 787c8eb6 2019-07-11 stsp git_commit $testroot/repo -m "modified alpha on newbranch"
861 787c8eb6 2019-07-11 stsp (cd $testroot/repo && got log -c newbranch -l2 | grep -v ^date: \
862 787c8eb6 2019-07-11 stsp > $testroot/log.expected)
864 787c8eb6 2019-07-11 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
865 787c8eb6 2019-07-11 stsp local orig_commit2=`git_show_head $testroot/repo`
867 787c8eb6 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
868 787c8eb6 2019-07-11 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
869 787c8eb6 2019-07-11 stsp git_commit $testroot/repo -m "committing to zeta on master"
870 787c8eb6 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
872 787c8eb6 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
874 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
875 787c8eb6 2019-07-11 stsp test_done "$testroot" "$ret"
879 787c8eb6 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > /dev/null \
880 787c8eb6 2019-07-11 stsp 2> $testroot/stderr)
882 787c8eb6 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
883 787c8eb6 2019-07-11 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
884 787c8eb6 2019-07-11 stsp local new_commit2=`git_show_head $testroot/repo`
886 787c8eb6 2019-07-11 stsp echo -n > $testroot/stderr.expected
887 64c6d990 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
889 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
890 64c6d990 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
891 787c8eb6 2019-07-11 stsp test_done "$testroot" "$ret"
895 787c8eb6 2019-07-11 stsp (cd $testroot/wt && got log -c newbranch -l2 | grep -v ^date: \
896 787c8eb6 2019-07-11 stsp > $testroot/log)
897 787c8eb6 2019-07-11 stsp sed -i -e "s/$orig_commit1/$new_commit1/" $testroot/log.expected
898 787c8eb6 2019-07-11 stsp sed -i -e "s/$orig_commit2/$new_commit2/" $testroot/log.expected
899 787c8eb6 2019-07-11 stsp cmp -s $testroot/log.expected $testroot/log
901 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
902 787c8eb6 2019-07-11 stsp diff -u $testroot/log.expected $testroot/log
905 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
908 f6cae3ed 2020-09-13 naddy test_rebase_no_commits_to_rebase() {
909 fc66b545 2019-08-12 stsp local testroot=`test_init rebase_no_commits_to_rebase`
911 fc66b545 2019-08-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
913 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
914 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
918 da76fce2 2020-02-24 stsp (cd $testroot/wt && got branch -n newbranch)
920 fc66b545 2019-08-12 stsp echo "modified alpha on master" > $testroot/wt/alpha
921 fc66b545 2019-08-12 stsp (cd $testroot/wt && got commit -m 'test rebase_no_commits_to_rebase' \
922 fc66b545 2019-08-12 stsp > /dev/null)
923 fc66b545 2019-08-12 stsp (cd $testroot/wt && got update > /dev/null)
925 fc66b545 2019-08-12 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
926 fc66b545 2019-08-12 stsp 2> $testroot/stderr)
928 fc66b545 2019-08-12 stsp echo "got: no commits to rebase" > $testroot/stderr.expected
929 fc66b545 2019-08-12 stsp cmp -s $testroot/stderr.expected $testroot/stderr
931 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
932 fc66b545 2019-08-12 stsp diff -u $testroot/stderr.expected $testroot/stderr
933 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
937 f4a34a66 2022-04-16 thomas echo -n > $testroot/stdout.expected
938 fc66b545 2019-08-12 stsp cmp -s $testroot/stdout.expected $testroot/stdout
940 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
941 fc66b545 2019-08-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
942 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
946 fc66b545 2019-08-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
947 fc66b545 2019-08-12 stsp echo "Already up-to-date" > $testroot/stdout.expected
948 fc66b545 2019-08-12 stsp cmp -s $testroot/stdout.expected $testroot/stdout
950 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
951 fc66b545 2019-08-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
953 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
956 f6cae3ed 2020-09-13 naddy test_rebase_forward() {
957 38b0338b 2019-11-29 stsp local testroot=`test_init rebase_forward`
958 38b0338b 2019-11-29 stsp local commit0=`git_show_head $testroot/repo`
960 38b0338b 2019-11-29 stsp got checkout $testroot/repo $testroot/wt > /dev/null
962 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
963 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
967 38b0338b 2019-11-29 stsp echo "change alpha 1" > $testroot/wt/alpha
968 38b0338b 2019-11-29 stsp (cd $testroot/wt && got commit -m 'test rebase_forward' \
969 38b0338b 2019-11-29 stsp > /dev/null)
970 38b0338b 2019-11-29 stsp local commit1=`git_show_head $testroot/repo`
972 38b0338b 2019-11-29 stsp echo "change alpha 2" > $testroot/wt/alpha
973 38b0338b 2019-11-29 stsp (cd $testroot/wt && got commit -m 'test rebase_forward' \
974 38b0338b 2019-11-29 stsp > /dev/null)
975 38b0338b 2019-11-29 stsp local commit2=`git_show_head $testroot/repo`
977 38b0338b 2019-11-29 stsp # Simulate a situation where fast-forward is required.
978 38b0338b 2019-11-29 stsp # We want to fast-forward master to origin/master:
979 38b0338b 2019-11-29 stsp # commit 3907e11dceaae2ca7f8db79c2af31794673945ad (origin/master)
980 38b0338b 2019-11-29 stsp # commit ffcffcd102cf1af6572fbdbb4cf07a0f1fd2d840 (master)
981 38b0338b 2019-11-29 stsp # commit 87a6a8a2263a15b61c016ff1720b24741d455eb5
982 993f033b 2021-07-16 stsp (cd $testroot/repo && got ref -d master >/dev/null)
983 e31abbf2 2020-03-22 stsp (cd $testroot/repo && got ref -c $commit1 refs/heads/master)
984 e31abbf2 2020-03-22 stsp (cd $testroot/repo && got ref -c $commit2 refs/remotes/origin/master)
986 38b0338b 2019-11-29 stsp (cd $testroot/wt && got up -b origin/master > /dev/null)
988 38b0338b 2019-11-29 stsp (cd $testroot/wt && got rebase master \
989 38b0338b 2019-11-29 stsp > $testroot/stdout 2> $testroot/stderr)
991 38b0338b 2019-11-29 stsp echo "Forwarding refs/heads/master to commit $commit2" \
992 38b0338b 2019-11-29 stsp > $testroot/stdout.expected
993 38b0338b 2019-11-29 stsp echo "Switching work tree to refs/heads/master" \
994 38b0338b 2019-11-29 stsp >> $testroot/stdout.expected
995 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
997 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
998 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
999 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1003 38b0338b 2019-11-29 stsp # Ensure that rebase operation was completed correctly
1004 38b0338b 2019-11-29 stsp (cd $testroot/wt && got rebase -a \
1005 38b0338b 2019-11-29 stsp > $testroot/stdout 2> $testroot/stderr)
1006 38b0338b 2019-11-29 stsp echo -n "" > $testroot/stdout.expected
1007 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1009 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1010 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
1011 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1014 38b0338b 2019-11-29 stsp echo "got: rebase operation not in progress" > $testroot/stderr.expected
1015 38b0338b 2019-11-29 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1017 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1018 38b0338b 2019-11-29 stsp diff -u $testroot/stderr.expected $testroot/stderr
1019 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1023 da76fce2 2020-02-24 stsp (cd $testroot/wt && got branch -n > $testroot/stdout)
1024 38b0338b 2019-11-29 stsp echo "master" > $testroot/stdout.expected
1025 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1027 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1028 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
1029 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1033 38b0338b 2019-11-29 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1034 38b0338b 2019-11-29 stsp echo "commit $commit2 (master, origin/master)" > $testroot/stdout.expected
1035 38b0338b 2019-11-29 stsp echo "commit $commit1" >> $testroot/stdout.expected
1036 38b0338b 2019-11-29 stsp echo "commit $commit0" >> $testroot/stdout.expected
1037 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1039 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1040 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
1041 e600f124 2021-03-21 stsp test_done "$testroot" "$ret"
1045 e600f124 2021-03-21 stsp # Forward-only rebase operations should not be backed up
1046 e600f124 2021-03-21 stsp (cd $testroot/repo && got rebase -l > $testroot/stdout)
1047 e600f124 2021-03-21 stsp echo -n > $testroot/stdout.expected
1048 e600f124 2021-03-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1050 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1051 e600f124 2021-03-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1053 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1056 f6cae3ed 2020-09-13 naddy test_rebase_out_of_date() {
1057 e51d7b55 2020-01-04 stsp local testroot=`test_init rebase_out_of_date`
1058 e51d7b55 2020-01-04 stsp local initial_commit=`git_show_head $testroot/repo`
1060 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1061 e51d7b55 2020-01-04 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1062 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1064 e51d7b55 2020-01-04 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1065 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git rm -q beta)
1066 e51d7b55 2020-01-04 stsp echo "new file on branch" > $testroot/repo/epsilon/new
1067 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git add epsilon/new)
1068 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing more changes on newbranch"
1070 e51d7b55 2020-01-04 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1071 e51d7b55 2020-01-04 stsp local orig_commit2=`git_show_head $testroot/repo`
1073 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git checkout -q master)
1074 e51d7b55 2020-01-04 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1075 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing to zeta on master"
1076 e51d7b55 2020-01-04 stsp local master_commit1=`git_show_head $testroot/repo`
1078 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git checkout -q master)
1079 e51d7b55 2020-01-04 stsp echo "modified beta on master" > $testroot/repo/beta
1080 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing to beta on master"
1081 e51d7b55 2020-01-04 stsp local master_commit2=`git_show_head $testroot/repo`
1083 e51d7b55 2020-01-04 stsp got checkout -c $master_commit1 $testroot/repo $testroot/wt \
1084 e51d7b55 2020-01-04 stsp > /dev/null
1086 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1087 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1091 e51d7b55 2020-01-04 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
1092 e51d7b55 2020-01-04 stsp 2> $testroot/stderr)
1094 e51d7b55 2020-01-04 stsp echo -n > $testroot/stdout.expected
1095 e51d7b55 2020-01-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1097 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1098 e51d7b55 2020-01-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
1099 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1103 e51d7b55 2020-01-04 stsp echo -n "got: work tree must be updated before it can be " \
1104 e51d7b55 2020-01-04 stsp > $testroot/stderr.expected
1105 e51d7b55 2020-01-04 stsp echo "used to rebase a branch" >> $testroot/stderr.expected
1106 e51d7b55 2020-01-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1108 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1109 e51d7b55 2020-01-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
1110 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1114 e51d7b55 2020-01-04 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1115 e51d7b55 2020-01-04 stsp echo "commit $master_commit2 (master)" > $testroot/stdout.expected
1116 e51d7b55 2020-01-04 stsp echo "commit $master_commit1" >> $testroot/stdout.expected
1117 e51d7b55 2020-01-04 stsp echo "commit $initial_commit" >> $testroot/stdout.expected
1118 1ae0a341 2020-02-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1120 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1121 1ae0a341 2020-02-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1123 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1126 f6cae3ed 2020-09-13 naddy test_rebase_trims_empty_dir() {
1127 1ae0a341 2020-02-14 stsp local testroot=`test_init rebase_trims_empty_dir`
1129 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1130 1ae0a341 2020-02-14 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1131 1ae0a341 2020-02-14 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1133 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git rm -q epsilon/zeta)
1134 1ae0a341 2020-02-14 stsp git_commit $testroot/repo -m "removing zeta on newbranch"
1136 1ae0a341 2020-02-14 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1137 1ae0a341 2020-02-14 stsp local orig_commit2=`git_show_head $testroot/repo`
1139 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git checkout -q master)
1140 1ae0a341 2020-02-14 stsp echo "modified alpha on master" > $testroot/repo/alpha
1141 1ae0a341 2020-02-14 stsp git_commit $testroot/repo -m "committing to alpha on master"
1142 1ae0a341 2020-02-14 stsp local master_commit=`git_show_head $testroot/repo`
1144 1ae0a341 2020-02-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1146 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1147 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1151 1ae0a341 2020-02-14 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout)
1153 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git checkout -q newbranch)
1154 1ae0a341 2020-02-14 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
1155 1ae0a341 2020-02-14 stsp local new_commit2=`git_show_head $testroot/repo`
1157 1ae0a341 2020-02-14 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1158 1ae0a341 2020-02-14 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1159 1ae0a341 2020-02-14 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1160 1ae0a341 2020-02-14 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1162 1ae0a341 2020-02-14 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1163 1ae0a341 2020-02-14 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
1164 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1165 1ae0a341 2020-02-14 stsp echo ": committing to delta on newbranch" >> $testroot/stdout.expected
1166 1ae0a341 2020-02-14 stsp echo "D epsilon/zeta" >> $testroot/stdout.expected
1167 1ae0a341 2020-02-14 stsp echo -n "$short_orig_commit2 -> $short_new_commit2" \
1168 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1169 1ae0a341 2020-02-14 stsp echo ": removing zeta on newbranch" \
1170 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1171 1ae0a341 2020-02-14 stsp echo "Switching work tree to refs/heads/newbranch" \
1172 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1174 e51d7b55 2020-01-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1176 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1177 e51d7b55 2020-01-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
1178 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1182 1ae0a341 2020-02-14 stsp echo "modified delta on branch" > $testroot/content.expected
1183 1ae0a341 2020-02-14 stsp cat $testroot/wt/gamma/delta > $testroot/content
1184 1ae0a341 2020-02-14 stsp cmp -s $testroot/content.expected $testroot/content
1186 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1187 1ae0a341 2020-02-14 stsp diff -u $testroot/content.expected $testroot/content
1188 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1192 1ae0a341 2020-02-14 stsp echo "modified alpha on master" > $testroot/content.expected
1193 1ae0a341 2020-02-14 stsp cat $testroot/wt/alpha > $testroot/content
1194 1ae0a341 2020-02-14 stsp cmp -s $testroot/content.expected $testroot/content
1196 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1197 1ae0a341 2020-02-14 stsp diff -u $testroot/content.expected $testroot/content
1198 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1202 1ae0a341 2020-02-14 stsp if [ -e $testroot/wt/epsilon ]; then
1203 1ae0a341 2020-02-14 stsp echo "parent of removed zeta still exists on disk" >&2
1204 1ae0a341 2020-02-14 stsp test_done "$testroot" "1"
1208 1ae0a341 2020-02-14 stsp (cd $testroot/wt && got status > $testroot/stdout)
1210 1ae0a341 2020-02-14 stsp echo -n > $testroot/stdout.expected
1211 1ae0a341 2020-02-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1213 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1214 1ae0a341 2020-02-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1215 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1219 1ae0a341 2020-02-14 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1220 1ae0a341 2020-02-14 stsp echo "commit $new_commit2 (newbranch)" > $testroot/stdout.expected
1221 1ae0a341 2020-02-14 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
1222 1ae0a341 2020-02-14 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
1223 1ae0a341 2020-02-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1225 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1226 1ae0a341 2020-02-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1228 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1231 f6cae3ed 2020-09-13 naddy test_rebase_delete_missing_file() {
1232 ca6da77d 2020-03-22 stsp local testroot=`test_init rebase_delete_missing_file`
1234 ca6da77d 2020-03-22 stsp mkdir -p $testroot/repo/d/f/g
1235 ca6da77d 2020-03-22 stsp echo "new file" > $testroot/repo/d/f/g/new
1236 ca6da77d 2020-03-22 stsp (cd $testroot/repo && git add d/f/g/new)
1237 ca6da77d 2020-03-22 stsp git_commit $testroot/repo -m "adding a subdir"
1238 ca6da77d 2020-03-22 stsp local commit0=`git_show_head $testroot/repo`
1240 a740a1b3 2020-03-22 stsp got br -r $testroot/repo -c master newbranch
1242 a740a1b3 2020-03-22 stsp got checkout -b newbranch $testroot/repo $testroot/wt > /dev/null
1244 a740a1b3 2020-03-22 stsp echo "modified delta on branch" > $testroot/wt/gamma/delta
1245 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got commit \
1246 a740a1b3 2020-03-22 stsp -m "committing to delta on newbranch" > /dev/null)
1248 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got rm beta d/f/g/new > /dev/null)
1249 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got commit \
1250 a740a1b3 2020-03-22 stsp -m "removing beta and d/f/g/new on newbranch" > /dev/null)
1252 a740a1b3 2020-03-22 stsp (cd $testroot/repo && git checkout -q newbranch)
1253 ca6da77d 2020-03-22 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1254 ca6da77d 2020-03-22 stsp local orig_commit2=`git_show_head $testroot/repo`
1256 bb494413 2021-09-28 thomas local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1257 bb494413 2021-09-28 thomas local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1259 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got update -b master > /dev/null)
1260 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got rm beta d/f/g/new > /dev/null)
1261 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got commit \
1262 a740a1b3 2020-03-22 stsp -m "removing beta and d/f/g/new on master" > /dev/null)
1264 ca6da77d 2020-03-22 stsp (cd $testroot/repo && git checkout -q master)
1265 ca6da77d 2020-03-22 stsp local master_commit=`git_show_head $testroot/repo`
1267 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got update -b master > /dev/null)
1268 bb494413 2021-09-28 thomas (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
1269 bb494413 2021-09-28 thomas 2> $testroot/stderr)
1271 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1272 bb494413 2021-09-28 thomas echo "rebase succeeded unexpectedly" >&2
1273 bb494413 2021-09-28 thomas test_done "$testroot" "1"
1274 bb494413 2021-09-28 thomas return 1
1277 bb494413 2021-09-28 thomas local new_commit1=$(cd $testroot/wt && got info | \
1278 bb494413 2021-09-28 thomas grep '^work tree base commit: ' | cut -d: -f2 | tr -d ' ')
1280 ca6da77d 2020-03-22 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1281 ca6da77d 2020-03-22 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1283 ca6da77d 2020-03-22 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1284 ca6da77d 2020-03-22 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
1285 ca6da77d 2020-03-22 stsp >> $testroot/stdout.expected
1286 ca6da77d 2020-03-22 stsp echo ": committing to delta on newbranch" >> $testroot/stdout.expected
1287 ca6da77d 2020-03-22 stsp echo "! beta" >> $testroot/stdout.expected
1288 ca6da77d 2020-03-22 stsp echo "! d/f/g/new" >> $testroot/stdout.expected
1289 0ef68859 2021-09-28 thomas echo -n "Files which had incoming changes but could not be found " \
1290 0ef68859 2021-09-28 thomas >> $testroot/stdout.expected
1291 0ef68859 2021-09-28 thomas echo "in the work tree: 2" >> $testroot/stdout.expected
1292 bb494413 2021-09-28 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1294 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1295 bb494413 2021-09-28 thomas diff -u $testroot/stdout.expected $testroot/stdout
1296 bb494413 2021-09-28 thomas test_done "$testroot" "$ret"
1297 bb494413 2021-09-28 thomas return 1
1300 bb494413 2021-09-28 thomas echo -n "got: changes destined for some files were not yet merged " \
1301 bb494413 2021-09-28 thomas > $testroot/stderr.expected
1302 bb494413 2021-09-28 thomas echo -n "and should be merged manually if required before the " \
1303 bb494413 2021-09-28 thomas >> $testroot/stderr.expected
1304 bb494413 2021-09-28 thomas echo "rebase operation is continued" >> $testroot/stderr.expected
1305 bb494413 2021-09-28 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1307 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1308 bb494413 2021-09-28 thomas diff -u $testroot/stderr.expected $testroot/stderr
1309 bb494413 2021-09-28 thomas test_done "$testroot" "$ret"
1310 bb494413 2021-09-28 thomas return 1
1313 bb494413 2021-09-28 thomas # ignore the missing changes and continue
1314 bb494413 2021-09-28 thomas (cd $testroot/wt && got rebase -c > $testroot/stdout)
1316 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1317 bb494413 2021-09-28 thomas echo "rebase failed unexpectedly" >&2
1318 bb494413 2021-09-28 thomas test_done "$testroot" "1"
1319 bb494413 2021-09-28 thomas return 1
1321 ca6da77d 2020-03-22 stsp echo -n "$short_orig_commit2 -> no-op change" \
1322 bb494413 2021-09-28 thomas > $testroot/stdout.expected
1323 a740a1b3 2020-03-22 stsp echo ": removing beta and d/f/g/new on newbranch" \
1324 ca6da77d 2020-03-22 stsp >> $testroot/stdout.expected
1325 ca6da77d 2020-03-22 stsp echo "Switching work tree to refs/heads/newbranch" \
1326 ca6da77d 2020-03-22 stsp >> $testroot/stdout.expected
1328 ca6da77d 2020-03-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1330 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1331 ca6da77d 2020-03-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1332 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1336 ca6da77d 2020-03-22 stsp echo "modified delta on branch" > $testroot/content.expected
1337 ca6da77d 2020-03-22 stsp cat $testroot/wt/gamma/delta > $testroot/content
1338 ca6da77d 2020-03-22 stsp cmp -s $testroot/content.expected $testroot/content
1340 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1341 ca6da77d 2020-03-22 stsp diff -u $testroot/content.expected $testroot/content
1342 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1346 ca6da77d 2020-03-22 stsp if [ -e $testroot/wt/beta ]; then
1347 ca6da77d 2020-03-22 stsp echo "removed file beta still exists on disk" >&2
1348 ca6da77d 2020-03-22 stsp test_done "$testroot" "1"
1352 ca6da77d 2020-03-22 stsp (cd $testroot/wt && got status > $testroot/stdout)
1354 ca6da77d 2020-03-22 stsp echo -n > $testroot/stdout.expected
1355 ca6da77d 2020-03-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1357 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1358 ca6da77d 2020-03-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1359 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1363 bb494413 2021-09-28 thomas (cd $testroot/repo && git checkout -q newbranch)
1364 bb494413 2021-09-28 thomas local new_commit1=`git_show_head $testroot/repo`
1365 bb494413 2021-09-28 thomas local short_new_commit1=`trim_obj_id 28 $new_commit1`
1367 ca6da77d 2020-03-22 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1368 ca6da77d 2020-03-22 stsp echo "commit $new_commit1 (newbranch)" > $testroot/stdout.expected
1369 ca6da77d 2020-03-22 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
1370 ca6da77d 2020-03-22 stsp echo "commit $commit0" >> $testroot/stdout.expected
1371 70551d57 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1373 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1374 70551d57 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1376 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1379 f6cae3ed 2020-09-13 naddy test_rebase_rm_add_rm_file() {
1380 70551d57 2020-04-24 stsp local testroot=`test_init rebase_rm_add_rm_file`
1382 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1383 70551d57 2020-04-24 stsp (cd $testroot/repo && git rm -q beta)
1384 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "removing beta from newbranch"
1385 70551d57 2020-04-24 stsp local orig_commit1=`git_show_head $testroot/repo`
1387 70551d57 2020-04-24 stsp echo 'restored beta' > $testroot/repo/beta
1388 70551d57 2020-04-24 stsp (cd $testroot/repo && git add beta)
1389 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "restoring beta on newbranch"
1390 70551d57 2020-04-24 stsp local orig_commit2=`git_show_head $testroot/repo`
1392 70551d57 2020-04-24 stsp (cd $testroot/repo && git rm -q beta)
1393 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "removing beta from newbranch again"
1394 70551d57 2020-04-24 stsp local orig_commit3=`git_show_head $testroot/repo`
1396 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q master)
1397 70551d57 2020-04-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1398 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
1399 70551d57 2020-04-24 stsp local master_commit=`git_show_head $testroot/repo`
1401 70551d57 2020-04-24 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1403 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1404 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1408 70551d57 2020-04-24 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout)
1410 70551d57 2020-04-24 stsp # this would error out with 'got: file index is corrupt'
1411 70551d57 2020-04-24 stsp (cd $testroot/wt && got status > /dev/null)
1413 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1414 70551d57 2020-04-24 stsp echo "got status command failed unexpectedly" >&2
1415 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1419 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q newbranch)
1420 70551d57 2020-04-24 stsp local new_commit3=`git_show_head $testroot/repo`
1421 70551d57 2020-04-24 stsp local new_commit2=`git_show_parent_commit $testroot/repo`
1422 70551d57 2020-04-24 stsp local new_commit1=`git_show_parent_commit $testroot/repo $new_commit2`
1424 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q newbranch)
1426 70551d57 2020-04-24 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1427 70551d57 2020-04-24 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1428 70551d57 2020-04-24 stsp local short_orig_commit3=`trim_obj_id 28 $orig_commit3`
1429 70551d57 2020-04-24 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1430 70551d57 2020-04-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1431 70551d57 2020-04-24 stsp local short_new_commit3=`trim_obj_id 28 $new_commit3`
1433 70551d57 2020-04-24 stsp echo "D beta" > $testroot/stdout.expected
1434 70551d57 2020-04-24 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
1435 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1436 70551d57 2020-04-24 stsp echo ": removing beta from newbranch" >> $testroot/stdout.expected
1437 70551d57 2020-04-24 stsp echo "A beta" >> $testroot/stdout.expected
1438 70551d57 2020-04-24 stsp echo -n "$short_orig_commit2 -> $short_new_commit2" \
1439 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1440 70551d57 2020-04-24 stsp echo ": restoring beta on newbranch" >> $testroot/stdout.expected
1441 70551d57 2020-04-24 stsp echo "D beta" >> $testroot/stdout.expected
1442 70551d57 2020-04-24 stsp echo -n "$short_orig_commit3 -> $short_new_commit3" \
1443 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1444 70551d57 2020-04-24 stsp echo ": removing beta from newbranch again" >> $testroot/stdout.expected
1445 70551d57 2020-04-24 stsp echo "Switching work tree to refs/heads/newbranch" \
1446 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1448 ca6da77d 2020-03-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1450 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1451 ca6da77d 2020-03-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1452 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1456 70551d57 2020-04-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
1458 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1459 70551d57 2020-04-24 stsp echo "got status command failed unexpectedly" >&2
1460 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1464 70551d57 2020-04-24 stsp echo -n > $testroot/stdout.expected
1465 70551d57 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1467 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1468 70551d57 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1469 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1473 70551d57 2020-04-24 stsp (cd $testroot/wt && got log -l4 | grep ^commit > $testroot/stdout)
1474 70551d57 2020-04-24 stsp echo "commit $new_commit3 (newbranch)" > $testroot/stdout.expected
1475 70551d57 2020-04-24 stsp echo "commit $new_commit2" >> $testroot/stdout.expected
1476 70551d57 2020-04-24 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
1477 70551d57 2020-04-24 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
1478 70551d57 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1480 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1481 70551d57 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1483 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1486 7fb414ae 2020-08-08 stsp test_parseargs "$@"
1487 dcf44d04 2019-07-11 stsp run_test test_rebase_basic
1488 dcf44d04 2019-07-11 stsp run_test test_rebase_ancestry_check
1489 dcf44d04 2019-07-11 stsp run_test test_rebase_continue
1490 dcf44d04 2019-07-11 stsp run_test test_rebase_abort
1491 ff0d2220 2019-07-11 stsp run_test test_rebase_no_op_change
1492 7d5807f4 2019-07-11 stsp run_test test_rebase_in_progress
1493 64c6d990 2019-07-11 stsp run_test test_rebase_path_prefix
1494 787c8eb6 2019-07-11 stsp run_test test_rebase_preserves_logmsg
1495 fc66b545 2019-08-12 stsp run_test test_rebase_no_commits_to_rebase
1496 38b0338b 2019-11-29 stsp run_test test_rebase_forward
1497 e51d7b55 2020-01-04 stsp run_test test_rebase_out_of_date
1498 1ae0a341 2020-02-14 stsp run_test test_rebase_trims_empty_dir
1499 ca6da77d 2020-03-22 stsp run_test test_rebase_delete_missing_file
1500 70551d57 2020-04-24 stsp run_test test_rebase_rm_add_rm_file
