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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 49c543a6 2022-03-31 naddy 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 3a6b8760 2021-08-31 naddy d_orig2=`date -u -r $orig_author_time2 +"%a %b %e %X %Y UTC"`
157 3a6b8760 2021-08-31 naddy d_new2=`date -u -r $new_author_time2 +"%G-%m-%d"`
158 3a6b8760 2021-08-31 naddy d_0=`date -u -r $commit0_author_time +"%G-%m-%d"`
159 e600f124 2021-03-21 stsp cat > $testroot/stdout.expected <<EOF
160 e600f124 2021-03-21 stsp -----------------------------------------------
161 e600f124 2021-03-21 stsp commit $orig_commit2 (formerly newbranch)
162 e600f124 2021-03-21 stsp from: $GOT_AUTHOR
163 e600f124 2021-03-21 stsp date: $d_orig2
165 e600f124 2021-03-21 stsp committing more changes on newbranch
167 e600f124 2021-03-21 stsp has become commit $new_commit2 (newbranch)
168 e600f124 2021-03-21 stsp $d_new2 $GOT_AUTHOR_11 committing more changes on newbranch
169 e600f124 2021-03-21 stsp history forked at $commit0
170 e600f124 2021-03-21 stsp $d_0 $GOT_AUTHOR_11 adding the test tree
172 e600f124 2021-03-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
174 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
175 e600f124 2021-03-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
176 9e822917 2021-03-23 stsp test_done "$testroot" "$ret"
180 9e822917 2021-03-23 stsp # Asking for backups of a branch which has none should yield an error
181 9e822917 2021-03-23 stsp (cd $testroot/repo && got rebase -l master \
182 9e822917 2021-03-23 stsp > $testroot/stdout 2> $testroot/stderr)
183 9e822917 2021-03-23 stsp echo -n > $testroot/stdout.expected
184 9e822917 2021-03-23 stsp echo "got: refs/got/backup/rebase/master/: no such reference found" \
185 9e822917 2021-03-23 stsp > $testroot/stderr.expected
186 9e822917 2021-03-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
188 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
189 9e822917 2021-03-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
190 9e822917 2021-03-23 stsp test_done "$testroot" "$ret"
193 9e822917 2021-03-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
195 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
196 9e822917 2021-03-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
197 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
201 643b85bc 2021-07-16 stsp # Delete all backup refs
202 643b85bc 2021-07-16 stsp (cd $testroot/repo && got rebase -X \
203 643b85bc 2021-07-16 stsp > $testroot/stdout 2> $testroot/stderr)
204 643b85bc 2021-07-16 stsp echo -n "Deleted refs/got/backup/rebase/newbranch/$new_commit2: " \
205 643b85bc 2021-07-16 stsp > $testroot/stdout.expected
206 643b85bc 2021-07-16 stsp echo "$orig_commit2" >> $testroot/stdout.expected
207 643b85bc 2021-07-16 stsp echo -n > $testroot/stderr.expected
208 643b85bc 2021-07-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
210 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
211 643b85bc 2021-07-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
212 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
215 643b85bc 2021-07-16 stsp cmp -s $testroot/stderr.expected $testroot/stderr
217 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
218 643b85bc 2021-07-16 stsp diff -u $testroot/stderr.expected $testroot/stderr
219 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
223 643b85bc 2021-07-16 stsp (cd $testroot/repo && got rebase -l > $testroot/stdout)
224 643b85bc 2021-07-16 stsp echo -n > $testroot/stdout.expected
225 643b85bc 2021-07-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
227 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
228 643b85bc 2021-07-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
230 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
233 f6cae3ed 2020-09-13 naddy test_rebase_ancestry_check() {
234 818c7501 2019-07-11 stsp local testroot=`test_init rebase_ancestry_check`
236 818c7501 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
238 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
239 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
243 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
244 818c7501 2019-07-11 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
245 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
246 3d42b266 2021-11-03 jrick local newbranch_id=`git_show_head $testroot/repo`
248 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
249 818c7501 2019-07-11 stsp 2> $testroot/stderr)
251 3d42b266 2021-11-03 jrick echo "refs/heads/newbranch is already based on refs/heads/master" \
252 3d42b266 2021-11-03 jrick > $testroot/stdout.expected
253 3d42b266 2021-11-03 jrick echo "Switching work tree from refs/heads/master to refs/heads/newbranch" \
254 3d42b266 2021-11-03 jrick >> $testroot/stdout.expected
255 3d42b266 2021-11-03 jrick echo "U gamma/delta" >> $testroot/stdout.expected
256 3d42b266 2021-11-03 jrick echo "Updated to refs/heads/newbranch: ${newbranch_id}" \
257 3d42b266 2021-11-03 jrick >> $testroot/stdout.expected
258 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
260 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
261 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
262 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
266 3d42b266 2021-11-03 jrick echo -n > $testroot/stderr.expected
267 818c7501 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
269 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
270 818c7501 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
272 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
275 f6cae3ed 2020-09-13 naddy test_rebase_continue() {
276 818c7501 2019-07-11 stsp local testroot=`test_init rebase_continue`
277 f69721c3 2019-10-21 stsp local init_commit=`git_show_head $testroot/repo`
279 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
280 818c7501 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
281 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
282 818c7501 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
283 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
285 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
286 818c7501 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
287 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
288 818c7501 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
290 818c7501 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
292 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
293 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
297 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
298 818c7501 2019-07-11 stsp 2> $testroot/stderr)
300 818c7501 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
301 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
302 a0ea4fc0 2020-02-28 stsp echo -n "$short_orig_commit1 -> merge conflict" \
303 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
304 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
305 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
307 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
308 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
309 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
313 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
314 818c7501 2019-07-11 stsp > $testroot/stderr.expected
315 818c7501 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
317 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
318 818c7501 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
319 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
323 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
324 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
325 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $init_commit" \
326 f69721c3 2019-10-21 stsp >> $testroot/content.expected
327 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
328 818c7501 2019-07-11 stsp echo "=======" >> $testroot/content.expected
329 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
330 54d5be07 2021-06-03 stsp echo ">>>>>>> merged change: commit $orig_commit1" \
331 54d5be07 2021-06-03 stsp >> $testroot/content.expected
332 818c7501 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
333 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
335 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
336 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
337 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
341 818c7501 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
343 818c7501 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
344 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
346 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
347 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
348 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
352 818c7501 2019-07-11 stsp # resolve the conflict
353 818c7501 2019-07-11 stsp echo "modified alpha on branch and master" > $testroot/wt/alpha
355 f032f1f7 2019-08-04 stsp # test interaction of 'got stage' and rebase -c
356 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got stage alpha > /dev/null)
357 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got rebase -c > $testroot/stdout \
358 f032f1f7 2019-08-04 stsp 2> $testroot/stderr)
360 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
361 f032f1f7 2019-08-04 stsp echo "rebase succeeded unexpectedly" >&2
362 f032f1f7 2019-08-04 stsp test_done "$testroot" "1"
365 f032f1f7 2019-08-04 stsp echo -n "got: work tree contains files with staged changes; " \
366 f032f1f7 2019-08-04 stsp > $testroot/stderr.expected
367 f032f1f7 2019-08-04 stsp echo "these changes must be committed or unstaged first" \
368 f032f1f7 2019-08-04 stsp >> $testroot/stderr.expected
369 f032f1f7 2019-08-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
371 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
372 f032f1f7 2019-08-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
373 f032f1f7 2019-08-04 stsp test_done "$testroot" "$ret"
377 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got unstage alpha > /dev/null)
378 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase -c > $testroot/stdout)
380 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
381 818c7501 2019-07-11 stsp local new_commit1=`git_show_head $testroot/repo`
382 818c7501 2019-07-11 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
384 818c7501 2019-07-11 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
385 818c7501 2019-07-11 stsp > $testroot/stdout.expected
386 818c7501 2019-07-11 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
387 818c7501 2019-07-11 stsp echo "Switching work tree to refs/heads/newbranch" \
388 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
390 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
392 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
393 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
394 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
399 818c7501 2019-07-11 stsp (cd $testroot/wt && got log -l2 | grep ^commit > $testroot/stdout)
400 818c7501 2019-07-11 stsp echo "commit $new_commit1 (newbranch)" > $testroot/stdout.expected
401 818c7501 2019-07-11 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
402 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
404 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
405 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
407 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
410 f6cae3ed 2020-09-13 naddy test_rebase_abort() {
411 818c7501 2019-07-11 stsp local testroot=`test_init rebase_abort`
413 818c7501 2019-07-11 stsp local init_commit=`git_show_head $testroot/repo`
415 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
416 1b093d84 2023-04-12 stsp echo "modified beta on branch" > $testroot/repo/beta
417 1b093d84 2023-04-12 stsp git_commit $testroot/repo -m "committing to beta on newbranch"
418 818c7501 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
419 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
421 1b093d84 2023-04-12 stsp echo "modified alpha on branch" > $testroot/repo/alpha
422 1b093d84 2023-04-12 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
423 1b093d84 2023-04-12 stsp local orig_commit2=`git_show_head $testroot/repo`
424 1b093d84 2023-04-12 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
426 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
427 818c7501 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
428 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
429 818c7501 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
431 818c7501 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
433 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
434 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
438 41f061b2 2021-10-05 stsp # unrelated unversioned file in work tree
439 41f061b2 2021-10-05 stsp touch $testroot/wt/unversioned-file
441 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
442 818c7501 2019-07-11 stsp 2> $testroot/stderr)
444 1b093d84 2023-04-12 stsp new_commit1=$(cd $testroot/wt && got info beta | \
445 1b093d84 2023-04-12 stsp grep '^based on commit:' | cut -d' ' -f4)
446 1b093d84 2023-04-12 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
448 1b093d84 2023-04-12 stsp echo "G beta" > $testroot/stdout.expected
449 1b093d84 2023-04-12 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
450 1b093d84 2023-04-12 stsp >> $testroot/stdout.expected
451 1b093d84 2023-04-12 stsp echo ": committing to beta on newbranch" >> $testroot/stdout.expected
452 1b093d84 2023-04-12 stsp echo "C alpha" >> $testroot/stdout.expected
453 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
454 1b093d84 2023-04-12 stsp echo -n "$short_orig_commit2 -> merge conflict" \
455 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
456 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
457 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
459 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
460 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
461 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
465 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
466 818c7501 2019-07-11 stsp > $testroot/stderr.expected
467 818c7501 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
469 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
470 818c7501 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
471 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
475 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
476 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
477 1b093d84 2023-04-12 stsp echo "||||||| 3-way merge base: commit $orig_commit1" \
478 f69721c3 2019-10-21 stsp >> $testroot/content.expected
479 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
480 818c7501 2019-07-11 stsp echo "=======" >> $testroot/content.expected
481 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
482 1b093d84 2023-04-12 stsp echo ">>>>>>> merged change: commit $orig_commit2" \
483 54d5be07 2021-06-03 stsp >> $testroot/content.expected
484 818c7501 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
485 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
487 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
488 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
489 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
493 818c7501 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
495 818c7501 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
496 41f061b2 2021-10-05 stsp echo "? unversioned-file" >> $testroot/stdout.expected
497 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
499 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
500 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
501 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
505 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase -a > $testroot/stdout)
507 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
509 818c7501 2019-07-11 stsp echo "Switching work tree to refs/heads/master" \
510 818c7501 2019-07-11 stsp > $testroot/stdout.expected
511 818c7501 2019-07-11 stsp echo 'R alpha' >> $testroot/stdout.expected
512 1b093d84 2023-04-12 stsp echo 'U beta' >> $testroot/stdout.expected
513 818c7501 2019-07-11 stsp echo "Rebase of refs/heads/newbranch aborted" \
514 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
516 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
518 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
519 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
520 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
524 818c7501 2019-07-11 stsp echo "modified alpha on master" > $testroot/content.expected
525 818c7501 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
526 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
528 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
529 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
530 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
534 818c7501 2019-07-11 stsp (cd $testroot/wt && got log -l3 -c newbranch \
535 818c7501 2019-07-11 stsp | grep ^commit > $testroot/stdout)
536 1b093d84 2023-04-12 stsp echo "commit $orig_commit2 (newbranch)" > $testroot/stdout.expected
537 1b093d84 2023-04-12 stsp echo "commit $orig_commit1" >> $testroot/stdout.expected
538 818c7501 2019-07-11 stsp echo "commit $init_commit" >> $testroot/stdout.expected
539 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
541 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
542 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
543 1b093d84 2023-04-12 stsp test_done "$testroot" "$ret"
547 1b093d84 2023-04-12 stsp (cd $testroot/wt && got info .| \
548 1b093d84 2023-04-12 stsp grep '^based on commit:' | sort | uniq > $testroot/stdout)
549 1b093d84 2023-04-12 stsp echo "based on commit: $master_commit" > $testroot/stdout.expected
550 1b093d84 2023-04-12 stsp cmp -s $testroot/stdout.expected $testroot/stdout
552 1b093d84 2023-04-12 stsp if [ $ret -ne 0 ]; then
553 1b093d84 2023-04-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
554 1b093d84 2023-04-12 stsp test_done "$testroot" "$ret"
558 1b093d84 2023-04-12 stsp (cd $testroot/wt && got status > $testroot/stdout)
559 1b093d84 2023-04-12 stsp echo "? unversioned-file" > $testroot/stdout.expected
560 1b093d84 2023-04-12 stsp cmp -s $testroot/stdout.expected $testroot/stdout
562 1b093d84 2023-04-12 stsp if [ $ret -ne 0 ]; then
563 1b093d84 2023-04-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
564 1b093d84 2023-04-12 stsp test_done "$testroot" "$ret"
568 1b093d84 2023-04-12 stsp cat $testroot/wt/beta > $testroot/content
569 1b093d84 2023-04-12 stsp echo 'beta' > $testroot/content.expected
570 1b093d84 2023-04-12 stsp cmp -s $testroot/content.expected $testroot/content
572 1b093d84 2023-04-12 stsp if [ $ret -ne 0 ]; then
573 1b093d84 2023-04-12 stsp diff -u $testroot/content.expected $testroot/content
574 1b093d84 2023-04-12 stsp test_done "$testroot" "$ret"
578 1b093d84 2023-04-12 stsp # A subsequent update should be a no-op.
579 1b093d84 2023-04-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
580 1b093d84 2023-04-12 stsp echo 'Already up-to-date' > $testroot/stdout.expected
581 1b093d84 2023-04-12 stsp cmp -s $testroot/stdout.expected $testroot/stdout
583 1b093d84 2023-04-12 stsp if [ $ret -ne 0 ]; then
584 1b093d84 2023-04-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
586 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
589 f6cae3ed 2020-09-13 naddy test_rebase_no_op_change() {
590 ff0d2220 2019-07-11 stsp local testroot=`test_init rebase_no_op_change`
591 ff0d2220 2019-07-11 stsp local init_commit=`git_show_head $testroot/repo`
593 ff0d2220 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
594 ff0d2220 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
595 ff0d2220 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
596 ff0d2220 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
597 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
599 ff0d2220 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
600 ff0d2220 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
601 ff0d2220 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
602 ff0d2220 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
604 ff0d2220 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
606 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
607 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
611 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
612 ff0d2220 2019-07-11 stsp 2> $testroot/stderr)
614 ff0d2220 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
615 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
616 a0ea4fc0 2020-02-28 stsp echo -n "$short_orig_commit1 -> merge conflict" \
617 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
618 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
619 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
621 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
622 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
623 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
627 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
628 ff0d2220 2019-07-11 stsp > $testroot/stderr.expected
629 ff0d2220 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
631 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
632 ff0d2220 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
633 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
637 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
638 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
639 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $init_commit" \
640 f69721c3 2019-10-21 stsp >> $testroot/content.expected
641 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
642 ff0d2220 2019-07-11 stsp echo "=======" >> $testroot/content.expected
643 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
644 54d5be07 2021-06-03 stsp echo ">>>>>>> merged change: commit $orig_commit1" \
645 54d5be07 2021-06-03 stsp >> $testroot/content.expected
646 ff0d2220 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
647 ff0d2220 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
649 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
650 ff0d2220 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
651 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
655 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
657 ff0d2220 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
658 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
660 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
661 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
662 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
666 ff0d2220 2019-07-11 stsp # resolve the conflict
667 ff0d2220 2019-07-11 stsp echo "modified alpha on master" > $testroot/wt/alpha
669 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got rebase -c > $testroot/stdout)
671 ff0d2220 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
672 ff0d2220 2019-07-11 stsp local new_commit1=`git_show_head $testroot/repo`
674 ff0d2220 2019-07-11 stsp echo -n "$short_orig_commit1 -> no-op change" \
675 ff0d2220 2019-07-11 stsp > $testroot/stdout.expected
676 ff0d2220 2019-07-11 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
677 ff0d2220 2019-07-11 stsp echo "Switching work tree to refs/heads/newbranch" \
678 ff0d2220 2019-07-11 stsp >> $testroot/stdout.expected
680 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
682 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
683 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
684 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
689 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got log -l2 | grep ^commit > $testroot/stdout)
690 ff0d2220 2019-07-11 stsp echo "commit $master_commit (master, newbranch)" \
691 ff0d2220 2019-07-11 stsp > $testroot/stdout.expected
692 ff0d2220 2019-07-11 stsp echo "commit $init_commit" >> $testroot/stdout.expected
693 7d5807f4 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
695 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
696 7d5807f4 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
698 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
701 f6cae3ed 2020-09-13 naddy test_rebase_in_progress() {
702 4ba9c4f6 2019-07-11 stsp local testroot=`test_init rebase_in_progress`
703 7d5807f4 2019-07-11 stsp local init_commit=`git_show_head $testroot/repo`
705 7d5807f4 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
706 7d5807f4 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
707 7d5807f4 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
708 7d5807f4 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
709 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
711 7d5807f4 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
712 7d5807f4 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
713 7d5807f4 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
714 7d5807f4 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
716 7d5807f4 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
718 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
719 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
723 7d5807f4 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
724 7d5807f4 2019-07-11 stsp 2> $testroot/stderr)
726 7d5807f4 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
727 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
728 a0ea4fc0 2020-02-28 stsp echo -n "$short_orig_commit1 -> merge conflict" \
729 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
730 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
731 7d5807f4 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
733 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
734 7d5807f4 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
735 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
739 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
740 7d5807f4 2019-07-11 stsp > $testroot/stderr.expected
741 7d5807f4 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
743 49c543a6 2022-03-31 naddy 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"
749 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
750 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
751 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $init_commit" \
752 f69721c3 2019-10-21 stsp >> $testroot/content.expected
753 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
754 7d5807f4 2019-07-11 stsp echo "=======" >> $testroot/content.expected
755 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
756 54d5be07 2021-06-03 stsp echo ">>>>>>> merged change: commit $orig_commit1" \
757 54d5be07 2021-06-03 stsp >> $testroot/content.expected
758 7d5807f4 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
759 7d5807f4 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
761 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
762 7d5807f4 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
763 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
767 7d5807f4 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
769 7d5807f4 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
770 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
772 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
773 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
774 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
778 7d5807f4 2019-07-11 stsp for cmd in update commit; do
779 7d5807f4 2019-07-11 stsp (cd $testroot/wt && got $cmd > $testroot/stdout \
780 7d5807f4 2019-07-11 stsp 2> $testroot/stderr)
782 7d5807f4 2019-07-11 stsp echo -n > $testroot/stdout.expected
783 7d5807f4 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
785 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
786 7d5807f4 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
787 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
791 7d5807f4 2019-07-11 stsp echo -n "got: a rebase operation is in progress in this " \
792 7d5807f4 2019-07-11 stsp > $testroot/stderr.expected
793 7d5807f4 2019-07-11 stsp echo "work tree and must be continued or aborted first" \
794 7d5807f4 2019-07-11 stsp >> $testroot/stderr.expected
795 7d5807f4 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
797 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
798 7d5807f4 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
799 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
804 64c6d990 2019-07-11 stsp test_done "$testroot" "$ret"
807 f6cae3ed 2020-09-13 naddy test_rebase_path_prefix() {
808 64c6d990 2019-07-11 stsp local testroot=`test_init rebase_path_prefix`
810 64c6d990 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
811 64c6d990 2019-07-11 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
812 64c6d990 2019-07-11 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
814 64c6d990 2019-07-11 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
815 64c6d990 2019-07-11 stsp local orig_commit2=`git_show_head $testroot/repo`
817 64c6d990 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
818 64c6d990 2019-07-11 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
819 64c6d990 2019-07-11 stsp git_commit $testroot/repo -m "committing to zeta on master"
820 64c6d990 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
822 64c6d990 2019-07-11 stsp got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
824 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
825 64c6d990 2019-07-11 stsp test_done "$testroot" "$ret"
829 64c6d990 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch \
830 64c6d990 2019-07-11 stsp > $testroot/stdout 2> $testroot/stderr)
832 64c6d990 2019-07-11 stsp echo -n > $testroot/stdout.expected
833 64c6d990 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
835 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
836 64c6d990 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
837 64c6d990 2019-07-11 stsp test_done "$testroot" "$ret"
841 64c6d990 2019-07-11 stsp echo -n "got: cannot rebase branch which contains changes outside " \
842 64c6d990 2019-07-11 stsp > $testroot/stderr.expected
843 64c6d990 2019-07-11 stsp echo "of this work tree's path prefix" >> $testroot/stderr.expected
844 787c8eb6 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
846 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
847 787c8eb6 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
848 67ba6161 2022-04-08 stsp test_done "$testroot" "$ret"
852 67ba6161 2022-04-08 stsp # rebase should succeed when using a complete work tree
853 67ba6161 2022-04-08 stsp got checkout $testroot/repo $testroot/wt2 > /dev/null
855 67ba6161 2022-04-08 stsp if [ $ret -ne 0 ]; then
856 67ba6161 2022-04-08 stsp test_done "$testroot" "$ret"
860 67ba6161 2022-04-08 stsp (cd $testroot/wt2 && got rebase newbranch \
861 67ba6161 2022-04-08 stsp > $testroot/stdout 2> $testroot/stderr)
863 67ba6161 2022-04-08 stsp (cd $testroot/repo && git checkout -q newbranch)
864 67ba6161 2022-04-08 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
865 67ba6161 2022-04-08 stsp local new_commit2=`git_show_head $testroot/repo`
867 67ba6161 2022-04-08 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
868 67ba6161 2022-04-08 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
870 67ba6161 2022-04-08 stsp echo "G gamma/delta" > $testroot/stdout.expected
871 67ba6161 2022-04-08 stsp echo -n "$short_orig_commit2 -> $short_new_commit2" \
872 67ba6161 2022-04-08 stsp >> $testroot/stdout.expected
873 67ba6161 2022-04-08 stsp echo ": committing to delta on newbranch" \
874 67ba6161 2022-04-08 stsp >> $testroot/stdout.expected
875 67ba6161 2022-04-08 stsp echo "Switching work tree to refs/heads/newbranch" \
876 67ba6161 2022-04-08 stsp >> $testroot/stdout.expected
878 67ba6161 2022-04-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
880 67ba6161 2022-04-08 stsp if [ $ret -ne 0 ]; then
881 67ba6161 2022-04-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
882 67ba6161 2022-04-08 stsp test_done "$testroot" "$ret"
886 67ba6161 2022-04-08 stsp # the first work tree should remain usable
887 67ba6161 2022-04-08 stsp (cd $testroot/wt && got update -b master \
888 67ba6161 2022-04-08 stsp > $testroot/stdout 2> $testroot/stderr)
890 67ba6161 2022-04-08 stsp if [ $ret -ne 0 ]; then
891 67ba6161 2022-04-08 stsp echo "update failed unexpectedly" >&2
892 67ba6161 2022-04-08 stsp test_done "$testroot" "1"
896 67ba6161 2022-04-08 stsp echo 'Already up-to-date' > $testroot/stdout.expected
897 67ba6161 2022-04-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
899 67ba6161 2022-04-08 stsp if [ $ret -ne 0 ]; then
900 67ba6161 2022-04-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
902 787c8eb6 2019-07-11 stsp test_done "$testroot" "$ret"
905 f6cae3ed 2020-09-13 naddy test_rebase_preserves_logmsg() {
906 787c8eb6 2019-07-11 stsp local testroot=`test_init rebase_preserves_logmsg`
908 787c8eb6 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
909 787c8eb6 2019-07-11 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
910 787c8eb6 2019-07-11 stsp git_commit $testroot/repo -m "modified delta on newbranch"
912 787c8eb6 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
913 787c8eb6 2019-07-11 stsp git_commit $testroot/repo -m "modified alpha on newbranch"
915 787c8eb6 2019-07-11 stsp (cd $testroot/repo && got log -c newbranch -l2 | grep -v ^date: \
916 787c8eb6 2019-07-11 stsp > $testroot/log.expected)
918 787c8eb6 2019-07-11 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
919 787c8eb6 2019-07-11 stsp local orig_commit2=`git_show_head $testroot/repo`
921 787c8eb6 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
922 787c8eb6 2019-07-11 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
923 787c8eb6 2019-07-11 stsp git_commit $testroot/repo -m "committing to zeta on master"
924 787c8eb6 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
926 787c8eb6 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
928 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
929 787c8eb6 2019-07-11 stsp test_done "$testroot" "$ret"
933 787c8eb6 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > /dev/null \
934 787c8eb6 2019-07-11 stsp 2> $testroot/stderr)
936 787c8eb6 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
937 787c8eb6 2019-07-11 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
938 787c8eb6 2019-07-11 stsp local new_commit2=`git_show_head $testroot/repo`
940 787c8eb6 2019-07-11 stsp echo -n > $testroot/stderr.expected
941 64c6d990 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
943 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
944 64c6d990 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
945 787c8eb6 2019-07-11 stsp test_done "$testroot" "$ret"
949 787c8eb6 2019-07-11 stsp (cd $testroot/wt && got log -c newbranch -l2 | grep -v ^date: \
950 787c8eb6 2019-07-11 stsp > $testroot/log)
951 885e96df 2023-03-06 naddy ed -s $testroot/log.expected <<-EOF
952 885e96df 2023-03-06 naddy ,s/$orig_commit1/$new_commit1/
953 885e96df 2023-03-06 naddy ,s/$orig_commit2/$new_commit2/
956 787c8eb6 2019-07-11 stsp cmp -s $testroot/log.expected $testroot/log
958 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
959 787c8eb6 2019-07-11 stsp diff -u $testroot/log.expected $testroot/log
962 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
965 f6cae3ed 2020-09-13 naddy test_rebase_no_commits_to_rebase() {
966 fc66b545 2019-08-12 stsp local testroot=`test_init rebase_no_commits_to_rebase`
968 fc66b545 2019-08-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
970 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
971 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
975 980c6786 2023-01-31 stsp # Create an unrelated branch with 'got import'.
976 980c6786 2023-01-31 stsp mkdir -p $testroot/newtree
977 980c6786 2023-01-31 stsp echo "new file" > $testroot/newtree/newfile
978 980c6786 2023-01-31 stsp got import -m new -b newbranch -r $testroot/repo \
979 980c6786 2023-01-31 stsp $testroot/newtree > /dev/null
981 fc66b545 2019-08-12 stsp echo "modified alpha on master" > $testroot/wt/alpha
982 fc66b545 2019-08-12 stsp (cd $testroot/wt && got commit -m 'test rebase_no_commits_to_rebase' \
983 fc66b545 2019-08-12 stsp > /dev/null)
984 fc66b545 2019-08-12 stsp (cd $testroot/wt && got update > /dev/null)
986 fc66b545 2019-08-12 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
987 fc66b545 2019-08-12 stsp 2> $testroot/stderr)
989 980c6786 2023-01-31 stsp echo -n "got: specified branch shares no common ancestry " \
990 980c6786 2023-01-31 stsp > $testroot/stderr.expected
991 980c6786 2023-01-31 stsp echo "with work tree's branch" >> $testroot/stderr.expected
992 fc66b545 2019-08-12 stsp cmp -s $testroot/stderr.expected $testroot/stderr
994 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
995 fc66b545 2019-08-12 stsp diff -u $testroot/stderr.expected $testroot/stderr
996 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
1000 67ba6161 2022-04-08 stsp echo -n > $testroot/stdout.expected
1001 fc66b545 2019-08-12 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1003 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1004 fc66b545 2019-08-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
1005 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
1009 fc66b545 2019-08-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
1010 fc66b545 2019-08-12 stsp echo "Already up-to-date" > $testroot/stdout.expected
1011 fc66b545 2019-08-12 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1013 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1014 fc66b545 2019-08-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
1016 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
1019 f6cae3ed 2020-09-13 naddy test_rebase_forward() {
1020 38b0338b 2019-11-29 stsp local testroot=`test_init rebase_forward`
1021 38b0338b 2019-11-29 stsp local commit0=`git_show_head $testroot/repo`
1023 38b0338b 2019-11-29 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1025 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1026 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1030 38b0338b 2019-11-29 stsp echo "change alpha 1" > $testroot/wt/alpha
1031 38b0338b 2019-11-29 stsp (cd $testroot/wt && got commit -m 'test rebase_forward' \
1032 38b0338b 2019-11-29 stsp > /dev/null)
1033 38b0338b 2019-11-29 stsp local commit1=`git_show_head $testroot/repo`
1035 38b0338b 2019-11-29 stsp echo "change alpha 2" > $testroot/wt/alpha
1036 38b0338b 2019-11-29 stsp (cd $testroot/wt && got commit -m 'test rebase_forward' \
1037 38b0338b 2019-11-29 stsp > /dev/null)
1038 38b0338b 2019-11-29 stsp local commit2=`git_show_head $testroot/repo`
1040 5e91dae4 2022-08-30 stsp # Simulate a situation where fast-forward is required.
1041 38b0338b 2019-11-29 stsp # We want to fast-forward master to origin/master:
1042 38b0338b 2019-11-29 stsp # commit 3907e11dceaae2ca7f8db79c2af31794673945ad (origin/master)
1043 38b0338b 2019-11-29 stsp # commit ffcffcd102cf1af6572fbdbb4cf07a0f1fd2d840 (master)
1044 38b0338b 2019-11-29 stsp # commit 87a6a8a2263a15b61c016ff1720b24741d455eb5
1045 993f033b 2021-07-16 stsp (cd $testroot/repo && got ref -d master >/dev/null)
1046 e31abbf2 2020-03-22 stsp (cd $testroot/repo && got ref -c $commit1 refs/heads/master)
1047 e31abbf2 2020-03-22 stsp (cd $testroot/repo && got ref -c $commit2 refs/remotes/origin/master)
1049 38b0338b 2019-11-29 stsp (cd $testroot/wt && got up -b origin/master > /dev/null)
1051 38b0338b 2019-11-29 stsp (cd $testroot/wt && got rebase master \
1052 0a706d22 2022-09-21 stsp > $testroot/stdout 2> $testroot/stderr)
1054 0a706d22 2022-09-21 stsp echo "Forwarding refs/heads/master to commit $commit2" \
1055 0a706d22 2022-09-21 stsp > $testroot/stdout.expected
1056 0a706d22 2022-09-21 stsp echo "Switching work tree to refs/heads/master" \
1057 0a706d22 2022-09-21 stsp >> $testroot/stdout.expected
1058 0a706d22 2022-09-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1060 0a706d22 2022-09-21 stsp if [ $ret -ne 0 ]; then
1061 0a706d22 2022-09-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1062 0a706d22 2022-09-21 stsp test_done "$testroot" "$ret"
1066 0a706d22 2022-09-21 stsp # Ensure that rebase operation was completed correctly
1067 0a706d22 2022-09-21 stsp (cd $testroot/wt && got rebase -a \
1068 0a706d22 2022-09-21 stsp > $testroot/stdout 2> $testroot/stderr)
1069 0a706d22 2022-09-21 stsp echo -n "" > $testroot/stdout.expected
1070 0a706d22 2022-09-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1072 0a706d22 2022-09-21 stsp if [ $ret -ne 0 ]; then
1073 0a706d22 2022-09-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1074 0a706d22 2022-09-21 stsp test_done "$testroot" "$ret"
1077 0a706d22 2022-09-21 stsp echo "got: rebase operation not in progress" > $testroot/stderr.expected
1078 0a706d22 2022-09-21 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1080 0a706d22 2022-09-21 stsp if [ $ret -ne 0 ]; then
1081 0a706d22 2022-09-21 stsp diff -u $testroot/stderr.expected $testroot/stderr
1082 0a706d22 2022-09-21 stsp test_done "$testroot" "$ret"
1086 0a706d22 2022-09-21 stsp (cd $testroot/wt && got branch -n > $testroot/stdout)
1087 0a706d22 2022-09-21 stsp echo "master" > $testroot/stdout.expected
1088 0a706d22 2022-09-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1090 0a706d22 2022-09-21 stsp if [ $ret -ne 0 ]; then
1091 0a706d22 2022-09-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1092 0a706d22 2022-09-21 stsp test_done "$testroot" "$ret"
1096 0a706d22 2022-09-21 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1097 0a706d22 2022-09-21 stsp echo "commit $commit2 (master, origin/master)" > $testroot/stdout.expected
1098 0a706d22 2022-09-21 stsp echo "commit $commit1" >> $testroot/stdout.expected
1099 0a706d22 2022-09-21 stsp echo "commit $commit0" >> $testroot/stdout.expected
1100 0a706d22 2022-09-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1102 0a706d22 2022-09-21 stsp if [ $ret -ne 0 ]; then
1103 0a706d22 2022-09-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1104 0a706d22 2022-09-21 stsp test_done "$testroot" "$ret"
1108 0a706d22 2022-09-21 stsp # Forward-only rebase operations should not be backed up
1109 0a706d22 2022-09-21 stsp (cd $testroot/repo && got rebase -l > $testroot/stdout)
1110 0a706d22 2022-09-21 stsp echo -n > $testroot/stdout.expected
1111 0a706d22 2022-09-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1113 0a706d22 2022-09-21 stsp if [ $ret -ne 0 ]; then
1114 0a706d22 2022-09-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1116 0a706d22 2022-09-21 stsp test_done "$testroot" "$ret"
1119 0a706d22 2022-09-21 stsp test_rebase_forward_path_prefix() {
1120 0a706d22 2022-09-21 stsp local testroot=`test_init rebase_forward_path_prefix`
1121 0a706d22 2022-09-21 stsp local commit0=`git_show_head $testroot/repo`
1123 0a706d22 2022-09-21 stsp got checkout $testroot/repo $testroot/wt-full > /dev/null
1125 0a706d22 2022-09-21 stsp if [ $ret -ne 0 ]; then
1126 0a706d22 2022-09-21 stsp test_done "$testroot" "$ret"
1130 0a706d22 2022-09-21 stsp echo "change alpha 1" > $testroot/wt-full/alpha
1131 0a706d22 2022-09-21 stsp (cd $testroot/wt-full && got commit -m 'test rebase_forward' \
1132 0a706d22 2022-09-21 stsp > /dev/null)
1133 0a706d22 2022-09-21 stsp local commit1=`git_show_head $testroot/repo`
1135 0a706d22 2022-09-21 stsp echo "change alpha 2" > $testroot/wt-full/alpha
1136 0a706d22 2022-09-21 stsp (cd $testroot/wt-full && got commit -m 'test rebase_forward' \
1137 0a706d22 2022-09-21 stsp > /dev/null)
1138 0a706d22 2022-09-21 stsp local commit2=`git_show_head $testroot/repo`
1140 0a706d22 2022-09-21 stsp # Simulate a situation where fast-forward is required.
1141 0a706d22 2022-09-21 stsp # We want to fast-forward master to origin/master:
1142 0a706d22 2022-09-21 stsp # commit 3907e11dceaae2ca7f8db79c2af31794673945ad (origin/master)
1143 0a706d22 2022-09-21 stsp # commit ffcffcd102cf1af6572fbdbb4cf07a0f1fd2d840 (master)
1144 0a706d22 2022-09-21 stsp # commit 87a6a8a2263a15b61c016ff1720b24741d455eb5
1145 0a706d22 2022-09-21 stsp (cd $testroot/repo && got ref -d master >/dev/null)
1146 0a706d22 2022-09-21 stsp (cd $testroot/repo && got ref -c $commit1 refs/heads/master)
1147 0a706d22 2022-09-21 stsp (cd $testroot/repo && got ref -c $commit2 refs/remotes/origin/master)
1149 0a706d22 2022-09-21 stsp # Work tree which uses a path-prefix and will be used for rebasing
1150 0a706d22 2022-09-21 stsp got checkout -p epsilon -b origin/master $testroot/repo $testroot/wt \
1151 0a706d22 2022-09-21 stsp > /dev/null
1153 0a706d22 2022-09-21 stsp if [ $ret -ne 0 ]; then
1154 0a706d22 2022-09-21 stsp test_done "$testroot" "$ret"
1158 2c75f174 2022-10-24 naddy (cd $testroot/wt && got rebase master \
1159 38b0338b 2019-11-29 stsp > $testroot/stdout 2> $testroot/stderr)
1161 38b0338b 2019-11-29 stsp echo "Forwarding refs/heads/master to commit $commit2" \
1162 38b0338b 2019-11-29 stsp > $testroot/stdout.expected
1163 38b0338b 2019-11-29 stsp echo "Switching work tree to refs/heads/master" \
1164 38b0338b 2019-11-29 stsp >> $testroot/stdout.expected
1165 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1167 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1168 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
1169 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1173 38b0338b 2019-11-29 stsp # Ensure that rebase operation was completed correctly
1174 38b0338b 2019-11-29 stsp (cd $testroot/wt && got rebase -a \
1175 38b0338b 2019-11-29 stsp > $testroot/stdout 2> $testroot/stderr)
1176 38b0338b 2019-11-29 stsp echo -n "" > $testroot/stdout.expected
1177 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1179 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1180 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
1181 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1184 38b0338b 2019-11-29 stsp echo "got: rebase operation not in progress" > $testroot/stderr.expected
1185 38b0338b 2019-11-29 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1187 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1188 38b0338b 2019-11-29 stsp diff -u $testroot/stderr.expected $testroot/stderr
1189 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1193 da76fce2 2020-02-24 stsp (cd $testroot/wt && got branch -n > $testroot/stdout)
1194 38b0338b 2019-11-29 stsp echo "master" > $testroot/stdout.expected
1195 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1197 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1198 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
1199 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1203 38b0338b 2019-11-29 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1204 38b0338b 2019-11-29 stsp echo "commit $commit2 (master, origin/master)" > $testroot/stdout.expected
1205 38b0338b 2019-11-29 stsp echo "commit $commit1" >> $testroot/stdout.expected
1206 38b0338b 2019-11-29 stsp echo "commit $commit0" >> $testroot/stdout.expected
1207 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1209 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1210 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
1211 e600f124 2021-03-21 stsp test_done "$testroot" "$ret"
1215 e600f124 2021-03-21 stsp # Forward-only rebase operations should not be backed up
1216 e600f124 2021-03-21 stsp (cd $testroot/repo && got rebase -l > $testroot/stdout)
1217 e600f124 2021-03-21 stsp echo -n > $testroot/stdout.expected
1218 e600f124 2021-03-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1220 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1221 e600f124 2021-03-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1223 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1226 f6cae3ed 2020-09-13 naddy test_rebase_out_of_date() {
1227 e51d7b55 2020-01-04 stsp local testroot=`test_init rebase_out_of_date`
1228 e51d7b55 2020-01-04 stsp local initial_commit=`git_show_head $testroot/repo`
1230 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1231 e51d7b55 2020-01-04 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1232 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1234 e51d7b55 2020-01-04 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1235 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git rm -q beta)
1236 e51d7b55 2020-01-04 stsp echo "new file on branch" > $testroot/repo/epsilon/new
1237 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git add epsilon/new)
1238 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing more changes on newbranch"
1240 e51d7b55 2020-01-04 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1241 e51d7b55 2020-01-04 stsp local orig_commit2=`git_show_head $testroot/repo`
1243 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git checkout -q master)
1244 e51d7b55 2020-01-04 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1245 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing to zeta on master"
1246 e51d7b55 2020-01-04 stsp local master_commit1=`git_show_head $testroot/repo`
1248 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git checkout -q master)
1249 e51d7b55 2020-01-04 stsp echo "modified beta on master" > $testroot/repo/beta
1250 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing to beta on master"
1251 e51d7b55 2020-01-04 stsp local master_commit2=`git_show_head $testroot/repo`
1253 e51d7b55 2020-01-04 stsp got checkout -c $master_commit1 $testroot/repo $testroot/wt \
1254 e51d7b55 2020-01-04 stsp > /dev/null
1256 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1257 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1261 e51d7b55 2020-01-04 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
1262 e51d7b55 2020-01-04 stsp 2> $testroot/stderr)
1264 e51d7b55 2020-01-04 stsp echo -n > $testroot/stdout.expected
1265 e51d7b55 2020-01-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1267 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1268 e51d7b55 2020-01-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
1269 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1273 e51d7b55 2020-01-04 stsp echo -n "got: work tree must be updated before it can be " \
1274 e51d7b55 2020-01-04 stsp > $testroot/stderr.expected
1275 e51d7b55 2020-01-04 stsp echo "used to rebase a branch" >> $testroot/stderr.expected
1276 e51d7b55 2020-01-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1278 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1279 e51d7b55 2020-01-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
1280 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1284 e51d7b55 2020-01-04 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1285 e51d7b55 2020-01-04 stsp echo "commit $master_commit2 (master)" > $testroot/stdout.expected
1286 e51d7b55 2020-01-04 stsp echo "commit $master_commit1" >> $testroot/stdout.expected
1287 e51d7b55 2020-01-04 stsp echo "commit $initial_commit" >> $testroot/stdout.expected
1288 1ae0a341 2020-02-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1290 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1291 1ae0a341 2020-02-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1293 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1296 f6cae3ed 2020-09-13 naddy test_rebase_trims_empty_dir() {
1297 1ae0a341 2020-02-14 stsp local testroot=`test_init rebase_trims_empty_dir`
1299 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1300 1ae0a341 2020-02-14 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1301 1ae0a341 2020-02-14 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1303 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git rm -q epsilon/zeta)
1304 1ae0a341 2020-02-14 stsp git_commit $testroot/repo -m "removing zeta on newbranch"
1306 1ae0a341 2020-02-14 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1307 1ae0a341 2020-02-14 stsp local orig_commit2=`git_show_head $testroot/repo`
1309 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git checkout -q master)
1310 1ae0a341 2020-02-14 stsp echo "modified alpha on master" > $testroot/repo/alpha
1311 1ae0a341 2020-02-14 stsp git_commit $testroot/repo -m "committing to alpha on master"
1312 1ae0a341 2020-02-14 stsp local master_commit=`git_show_head $testroot/repo`
1314 1ae0a341 2020-02-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1316 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1317 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1321 1ae0a341 2020-02-14 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout)
1323 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git checkout -q newbranch)
1324 1ae0a341 2020-02-14 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
1325 1ae0a341 2020-02-14 stsp local new_commit2=`git_show_head $testroot/repo`
1327 1ae0a341 2020-02-14 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1328 1ae0a341 2020-02-14 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1329 1ae0a341 2020-02-14 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1330 1ae0a341 2020-02-14 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1332 1ae0a341 2020-02-14 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1333 1ae0a341 2020-02-14 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
1334 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1335 1ae0a341 2020-02-14 stsp echo ": committing to delta on newbranch" >> $testroot/stdout.expected
1336 1ae0a341 2020-02-14 stsp echo "D epsilon/zeta" >> $testroot/stdout.expected
1337 1ae0a341 2020-02-14 stsp echo -n "$short_orig_commit2 -> $short_new_commit2" \
1338 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1339 1ae0a341 2020-02-14 stsp echo ": removing zeta on newbranch" \
1340 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1341 1ae0a341 2020-02-14 stsp echo "Switching work tree to refs/heads/newbranch" \
1342 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1344 e51d7b55 2020-01-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1346 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1347 e51d7b55 2020-01-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
1348 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1352 1ae0a341 2020-02-14 stsp echo "modified delta on branch" > $testroot/content.expected
1353 1ae0a341 2020-02-14 stsp cat $testroot/wt/gamma/delta > $testroot/content
1354 1ae0a341 2020-02-14 stsp cmp -s $testroot/content.expected $testroot/content
1356 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1357 1ae0a341 2020-02-14 stsp diff -u $testroot/content.expected $testroot/content
1358 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1362 1ae0a341 2020-02-14 stsp echo "modified alpha on master" > $testroot/content.expected
1363 1ae0a341 2020-02-14 stsp cat $testroot/wt/alpha > $testroot/content
1364 1ae0a341 2020-02-14 stsp cmp -s $testroot/content.expected $testroot/content
1366 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1367 1ae0a341 2020-02-14 stsp diff -u $testroot/content.expected $testroot/content
1368 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1372 1ae0a341 2020-02-14 stsp if [ -e $testroot/wt/epsilon ]; then
1373 1ae0a341 2020-02-14 stsp echo "parent of removed zeta still exists on disk" >&2
1374 1ae0a341 2020-02-14 stsp test_done "$testroot" "1"
1378 1ae0a341 2020-02-14 stsp (cd $testroot/wt && got status > $testroot/stdout)
1380 1ae0a341 2020-02-14 stsp echo -n > $testroot/stdout.expected
1381 1ae0a341 2020-02-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1383 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1384 1ae0a341 2020-02-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1385 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1389 1ae0a341 2020-02-14 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1390 1ae0a341 2020-02-14 stsp echo "commit $new_commit2 (newbranch)" > $testroot/stdout.expected
1391 1ae0a341 2020-02-14 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
1392 1ae0a341 2020-02-14 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
1393 1ae0a341 2020-02-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1395 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1396 1ae0a341 2020-02-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1398 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1401 f6cae3ed 2020-09-13 naddy test_rebase_delete_missing_file() {
1402 ca6da77d 2020-03-22 stsp local testroot=`test_init rebase_delete_missing_file`
1404 ca6da77d 2020-03-22 stsp mkdir -p $testroot/repo/d/f/g
1405 ca6da77d 2020-03-22 stsp echo "new file" > $testroot/repo/d/f/g/new
1406 ca6da77d 2020-03-22 stsp (cd $testroot/repo && git add d/f/g/new)
1407 ca6da77d 2020-03-22 stsp git_commit $testroot/repo -m "adding a subdir"
1408 ca6da77d 2020-03-22 stsp local commit0=`git_show_head $testroot/repo`
1410 a740a1b3 2020-03-22 stsp got br -r $testroot/repo -c master newbranch
1412 a740a1b3 2020-03-22 stsp got checkout -b newbranch $testroot/repo $testroot/wt > /dev/null
1414 a740a1b3 2020-03-22 stsp echo "modified delta on branch" > $testroot/wt/gamma/delta
1415 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got commit \
1416 a740a1b3 2020-03-22 stsp -m "committing to delta on newbranch" > /dev/null)
1418 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got rm beta d/f/g/new > /dev/null)
1419 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got commit \
1420 a740a1b3 2020-03-22 stsp -m "removing beta and d/f/g/new on newbranch" > /dev/null)
1422 a740a1b3 2020-03-22 stsp (cd $testroot/repo && git checkout -q newbranch)
1423 ca6da77d 2020-03-22 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1424 ca6da77d 2020-03-22 stsp local orig_commit2=`git_show_head $testroot/repo`
1426 1fa49072 2021-09-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1427 1fa49072 2021-09-28 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1429 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got update -b master > /dev/null)
1430 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got rm beta d/f/g/new > /dev/null)
1431 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got commit \
1432 a740a1b3 2020-03-22 stsp -m "removing beta and d/f/g/new on master" > /dev/null)
1434 ca6da77d 2020-03-22 stsp (cd $testroot/repo && git checkout -q master)
1435 ca6da77d 2020-03-22 stsp local master_commit=`git_show_head $testroot/repo`
1437 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got update -b master > /dev/null)
1438 1fa49072 2021-09-28 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
1439 1fa49072 2021-09-28 stsp 2> $testroot/stderr)
1441 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1442 1fa49072 2021-09-28 stsp echo "rebase succeeded unexpectedly" >&2
1443 1fa49072 2021-09-28 stsp test_done "$testroot" "1"
1447 1fa49072 2021-09-28 stsp local new_commit1=$(cd $testroot/wt && got info | \
1448 1fa49072 2021-09-28 stsp grep '^work tree base commit: ' | cut -d: -f2 | tr -d ' ')
1450 ca6da77d 2020-03-22 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1451 ca6da77d 2020-03-22 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1453 ca6da77d 2020-03-22 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1454 ca6da77d 2020-03-22 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
1455 ca6da77d 2020-03-22 stsp >> $testroot/stdout.expected
1456 ca6da77d 2020-03-22 stsp echo ": committing to delta on newbranch" >> $testroot/stdout.expected
1457 ca6da77d 2020-03-22 stsp echo "! beta" >> $testroot/stdout.expected
1458 ca6da77d 2020-03-22 stsp echo "! d/f/g/new" >> $testroot/stdout.expected
1459 35ca1db7 2021-09-28 stsp echo -n "Files which had incoming changes but could not be found " \
1460 35ca1db7 2021-09-28 stsp >> $testroot/stdout.expected
1461 35ca1db7 2021-09-28 stsp echo "in the work tree: 2" >> $testroot/stdout.expected
1462 1fa49072 2021-09-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1464 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1465 1fa49072 2021-09-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
1466 1fa49072 2021-09-28 stsp test_done "$testroot" "$ret"
1470 1fa49072 2021-09-28 stsp echo -n "got: changes destined for some files were not yet merged " \
1471 1fa49072 2021-09-28 stsp > $testroot/stderr.expected
1472 1fa49072 2021-09-28 stsp echo -n "and should be merged manually if required before the " \
1473 1fa49072 2021-09-28 stsp >> $testroot/stderr.expected
1474 1fa49072 2021-09-28 stsp echo "rebase operation is continued" >> $testroot/stderr.expected
1475 1fa49072 2021-09-28 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1477 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1478 1fa49072 2021-09-28 stsp diff -u $testroot/stderr.expected $testroot/stderr
1479 1fa49072 2021-09-28 stsp test_done "$testroot" "$ret"
1483 1fa49072 2021-09-28 stsp # ignore the missing changes and continue
1484 1fa49072 2021-09-28 stsp (cd $testroot/wt && got rebase -c > $testroot/stdout)
1486 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1487 1fa49072 2021-09-28 stsp echo "rebase failed unexpectedly" >&2
1488 1fa49072 2021-09-28 stsp test_done "$testroot" "1"
1491 ca6da77d 2020-03-22 stsp echo -n "$short_orig_commit2 -> no-op change" \
1492 1fa49072 2021-09-28 stsp > $testroot/stdout.expected
1493 a740a1b3 2020-03-22 stsp echo ": removing beta and d/f/g/new on newbranch" \
1494 ca6da77d 2020-03-22 stsp >> $testroot/stdout.expected
1495 ca6da77d 2020-03-22 stsp echo "Switching work tree to refs/heads/newbranch" \
1496 ca6da77d 2020-03-22 stsp >> $testroot/stdout.expected
1498 ca6da77d 2020-03-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1500 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1501 ca6da77d 2020-03-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1502 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1506 ca6da77d 2020-03-22 stsp echo "modified delta on branch" > $testroot/content.expected
1507 ca6da77d 2020-03-22 stsp cat $testroot/wt/gamma/delta > $testroot/content
1508 ca6da77d 2020-03-22 stsp cmp -s $testroot/content.expected $testroot/content
1510 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1511 ca6da77d 2020-03-22 stsp diff -u $testroot/content.expected $testroot/content
1512 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1516 ca6da77d 2020-03-22 stsp if [ -e $testroot/wt/beta ]; then
1517 ca6da77d 2020-03-22 stsp echo "removed file beta still exists on disk" >&2
1518 ca6da77d 2020-03-22 stsp test_done "$testroot" "1"
1522 ca6da77d 2020-03-22 stsp (cd $testroot/wt && got status > $testroot/stdout)
1524 ca6da77d 2020-03-22 stsp echo -n > $testroot/stdout.expected
1525 ca6da77d 2020-03-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1527 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1528 ca6da77d 2020-03-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1529 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1533 1fa49072 2021-09-28 stsp (cd $testroot/repo && git checkout -q newbranch)
1534 1fa49072 2021-09-28 stsp local new_commit1=`git_show_head $testroot/repo`
1535 1fa49072 2021-09-28 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1537 ca6da77d 2020-03-22 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1538 ca6da77d 2020-03-22 stsp echo "commit $new_commit1 (newbranch)" > $testroot/stdout.expected
1539 ca6da77d 2020-03-22 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
1540 ca6da77d 2020-03-22 stsp echo "commit $commit0" >> $testroot/stdout.expected
1541 70551d57 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1543 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1544 70551d57 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1546 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1549 f6cae3ed 2020-09-13 naddy test_rebase_rm_add_rm_file() {
1550 70551d57 2020-04-24 stsp local testroot=`test_init rebase_rm_add_rm_file`
1552 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1553 70551d57 2020-04-24 stsp (cd $testroot/repo && git rm -q beta)
1554 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "removing beta from newbranch"
1555 70551d57 2020-04-24 stsp local orig_commit1=`git_show_head $testroot/repo`
1557 70551d57 2020-04-24 stsp echo 'restored beta' > $testroot/repo/beta
1558 70551d57 2020-04-24 stsp (cd $testroot/repo && git add beta)
1559 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "restoring beta on newbranch"
1560 70551d57 2020-04-24 stsp local orig_commit2=`git_show_head $testroot/repo`
1562 70551d57 2020-04-24 stsp (cd $testroot/repo && git rm -q beta)
1563 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "removing beta from newbranch again"
1564 70551d57 2020-04-24 stsp local orig_commit3=`git_show_head $testroot/repo`
1566 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q master)
1567 70551d57 2020-04-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1568 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
1569 70551d57 2020-04-24 stsp local master_commit=`git_show_head $testroot/repo`
1571 70551d57 2020-04-24 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1573 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1574 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1578 70551d57 2020-04-24 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout)
1580 70551d57 2020-04-24 stsp # this would error out with 'got: file index is corrupt'
1581 70551d57 2020-04-24 stsp (cd $testroot/wt && got status > /dev/null)
1583 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1584 70551d57 2020-04-24 stsp echo "got status command failed unexpectedly" >&2
1585 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1589 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q newbranch)
1590 70551d57 2020-04-24 stsp local new_commit3=`git_show_head $testroot/repo`
1591 70551d57 2020-04-24 stsp local new_commit2=`git_show_parent_commit $testroot/repo`
1592 70551d57 2020-04-24 stsp local new_commit1=`git_show_parent_commit $testroot/repo $new_commit2`
1594 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q newbranch)
1596 70551d57 2020-04-24 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1597 70551d57 2020-04-24 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1598 70551d57 2020-04-24 stsp local short_orig_commit3=`trim_obj_id 28 $orig_commit3`
1599 70551d57 2020-04-24 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1600 70551d57 2020-04-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1601 70551d57 2020-04-24 stsp local short_new_commit3=`trim_obj_id 28 $new_commit3`
1603 70551d57 2020-04-24 stsp echo "D beta" > $testroot/stdout.expected
1604 70551d57 2020-04-24 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
1605 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1606 70551d57 2020-04-24 stsp echo ": removing beta from newbranch" >> $testroot/stdout.expected
1607 70551d57 2020-04-24 stsp echo "A beta" >> $testroot/stdout.expected
1608 70551d57 2020-04-24 stsp echo -n "$short_orig_commit2 -> $short_new_commit2" \
1609 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1610 70551d57 2020-04-24 stsp echo ": restoring beta on newbranch" >> $testroot/stdout.expected
1611 70551d57 2020-04-24 stsp echo "D beta" >> $testroot/stdout.expected
1612 70551d57 2020-04-24 stsp echo -n "$short_orig_commit3 -> $short_new_commit3" \
1613 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1614 70551d57 2020-04-24 stsp echo ": removing beta from newbranch again" >> $testroot/stdout.expected
1615 70551d57 2020-04-24 stsp echo "Switching work tree to refs/heads/newbranch" \
1616 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1618 ca6da77d 2020-03-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1620 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1621 ca6da77d 2020-03-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1622 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1626 70551d57 2020-04-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
1628 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1629 70551d57 2020-04-24 stsp echo "got status command failed unexpectedly" >&2
1630 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1634 70551d57 2020-04-24 stsp echo -n > $testroot/stdout.expected
1635 70551d57 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1637 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1638 70551d57 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1639 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1643 70551d57 2020-04-24 stsp (cd $testroot/wt && got log -l4 | grep ^commit > $testroot/stdout)
1644 70551d57 2020-04-24 stsp echo "commit $new_commit3 (newbranch)" > $testroot/stdout.expected
1645 70551d57 2020-04-24 stsp echo "commit $new_commit2" >> $testroot/stdout.expected
1646 70551d57 2020-04-24 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
1647 70551d57 2020-04-24 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
1648 70551d57 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1650 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1651 70551d57 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1653 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1656 598eac43 2022-07-22 stsp test_rebase_resets_committer() {
1657 598eac43 2022-07-22 stsp local testroot=`test_init rebase_resets_committer`
1658 598eac43 2022-07-22 stsp local commit0=`git_show_head $testroot/repo`
1659 598eac43 2022-07-22 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
1660 598eac43 2022-07-22 stsp local committer="Flan Luck <flan_luck@openbsd.org>"
1662 598eac43 2022-07-22 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1663 598eac43 2022-07-22 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1664 598eac43 2022-07-22 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1666 598eac43 2022-07-22 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1667 598eac43 2022-07-22 stsp git_commit $testroot/repo -m "committing more changes on newbranch"
1669 598eac43 2022-07-22 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1670 598eac43 2022-07-22 stsp local orig_commit2=`git_show_head $testroot/repo`
1671 598eac43 2022-07-22 stsp local orig_author_time2=`git_show_author_time $testroot/repo`
1673 598eac43 2022-07-22 stsp (cd $testroot/repo && git checkout -q master)
1674 598eac43 2022-07-22 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1675 598eac43 2022-07-22 stsp git_commit $testroot/repo -m "committing to zeta on master"
1676 598eac43 2022-07-22 stsp local master_commit=`git_show_head $testroot/repo`
1678 598eac43 2022-07-22 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1680 598eac43 2022-07-22 stsp if [ $ret -ne 0 ]; then
1681 598eac43 2022-07-22 stsp test_done "$testroot" "$ret"
1685 598eac43 2022-07-22 stsp (cd $testroot/wt && env GOT_AUTHOR="$committer" \
1686 598eac43 2022-07-22 stsp got rebase newbranch > $testroot/stdout)
1688 598eac43 2022-07-22 stsp (cd $testroot/repo && git checkout -q newbranch)
1689 598eac43 2022-07-22 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
1690 598eac43 2022-07-22 stsp local new_commit2=`git_show_head $testroot/repo`
1691 598eac43 2022-07-22 stsp local new_author_time2=`git_show_author_time $testroot/repo`
1693 598eac43 2022-07-22 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1694 598eac43 2022-07-22 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1695 598eac43 2022-07-22 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1696 598eac43 2022-07-22 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1698 598eac43 2022-07-22 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1699 598eac43 2022-07-22 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
1700 598eac43 2022-07-22 stsp >> $testroot/stdout.expected
1701 598eac43 2022-07-22 stsp echo ": committing to delta on newbranch" >> $testroot/stdout.expected
1702 598eac43 2022-07-22 stsp echo "G alpha" >> $testroot/stdout.expected
1703 598eac43 2022-07-22 stsp echo -n "$short_orig_commit2 -> $short_new_commit2" \
1704 598eac43 2022-07-22 stsp >> $testroot/stdout.expected
1705 598eac43 2022-07-22 stsp echo ": committing more changes on newbranch" \
1706 598eac43 2022-07-22 stsp >> $testroot/stdout.expected
1707 598eac43 2022-07-22 stsp echo "Switching work tree to refs/heads/newbranch" \
1708 598eac43 2022-07-22 stsp >> $testroot/stdout.expected
1710 598eac43 2022-07-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1712 598eac43 2022-07-22 stsp if [ $ret -ne 0 ]; then
1713 598eac43 2022-07-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1714 598eac43 2022-07-22 stsp test_done "$testroot" "$ret"
1718 598eac43 2022-07-22 stsp # Original commit only had one author
1719 598eac43 2022-07-22 stsp (cd $testroot/repo && got log -l1 -c $orig_commit2 | \
1720 598eac43 2022-07-22 stsp egrep '^(from|via):' > $testroot/stdout)
1721 598eac43 2022-07-22 stsp echo "from: $GOT_AUTHOR" > $testroot/stdout.expected
1722 598eac43 2022-07-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1724 598eac43 2022-07-22 stsp if [ $ret -ne 0 ]; then
1725 598eac43 2022-07-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1726 598eac43 2022-07-22 stsp test_done "$testroot" "$ret"
1730 598eac43 2022-07-22 stsp # Rebased commit should have new committer name added
1731 598eac43 2022-07-22 stsp (cd $testroot/repo && got log -l1 -c $new_commit2 | \
1732 598eac43 2022-07-22 stsp egrep '^(from|via):' > $testroot/stdout)
1733 598eac43 2022-07-22 stsp echo "from: $GOT_AUTHOR" > $testroot/stdout.expected
1734 598eac43 2022-07-22 stsp echo "via: $committer" >> $testroot/stdout.expected
1736 50e7a649 2022-07-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1738 50e7a649 2022-07-22 stsp if [ $ret -ne 0 ]; then
1739 50e7a649 2022-07-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1741 50e7a649 2022-07-22 stsp test_done "$testroot" "$ret"
1744 50e7a649 2022-07-22 stsp test_rebase_no_author_info() {
1745 50e7a649 2022-07-22 stsp local testroot=`test_init rebase_no_author_info`
1746 50e7a649 2022-07-22 stsp local commit0=`git_show_head $testroot/repo`
1747 50e7a649 2022-07-22 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
1748 50e7a649 2022-07-22 stsp local committer="$GOT_AUTHOR"
1750 50e7a649 2022-07-22 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1751 50e7a649 2022-07-22 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1752 50e7a649 2022-07-22 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1754 50e7a649 2022-07-22 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1755 50e7a649 2022-07-22 stsp git_commit $testroot/repo -m "committing more changes on newbranch"
1757 50e7a649 2022-07-22 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1758 50e7a649 2022-07-22 stsp local orig_commit2=`git_show_head $testroot/repo`
1759 50e7a649 2022-07-22 stsp local orig_author_time2=`git_show_author_time $testroot/repo`
1761 50e7a649 2022-07-22 stsp (cd $testroot/repo && git checkout -q master)
1762 50e7a649 2022-07-22 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1763 50e7a649 2022-07-22 stsp git_commit $testroot/repo -m "committing to zeta on master"
1764 50e7a649 2022-07-22 stsp local master_commit=`git_show_head $testroot/repo`
1766 50e7a649 2022-07-22 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1768 50e7a649 2022-07-22 stsp if [ $ret -ne 0 ]; then
1769 50e7a649 2022-07-22 stsp test_done "$testroot" "$ret"
1773 1004841d 2022-07-24 op # unset in a subshell to avoid affecting our environment
1774 1004841d 2022-07-24 op (unset GOT_AUTHOR && cd $testroot/wt && \
1775 1004841d 2022-07-24 op got rebase newbranch > $testroot/stdout)
1777 50e7a649 2022-07-22 stsp (cd $testroot/repo && git checkout -q newbranch)
1778 50e7a649 2022-07-22 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
1779 50e7a649 2022-07-22 stsp local new_commit2=`git_show_head $testroot/repo`
1780 50e7a649 2022-07-22 stsp local new_author_time2=`git_show_author_time $testroot/repo`
1782 50e7a649 2022-07-22 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1783 50e7a649 2022-07-22 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1784 50e7a649 2022-07-22 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1785 50e7a649 2022-07-22 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1787 50e7a649 2022-07-22 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1788 50e7a649 2022-07-22 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
1789 50e7a649 2022-07-22 stsp >> $testroot/stdout.expected
1790 50e7a649 2022-07-22 stsp echo ": committing to delta on newbranch" >> $testroot/stdout.expected
1791 50e7a649 2022-07-22 stsp echo "G alpha" >> $testroot/stdout.expected
1792 50e7a649 2022-07-22 stsp echo -n "$short_orig_commit2 -> $short_new_commit2" \
1793 50e7a649 2022-07-22 stsp >> $testroot/stdout.expected
1794 50e7a649 2022-07-22 stsp echo ": committing more changes on newbranch" \
1795 50e7a649 2022-07-22 stsp >> $testroot/stdout.expected
1796 50e7a649 2022-07-22 stsp echo "Switching work tree to refs/heads/newbranch" \
1797 50e7a649 2022-07-22 stsp >> $testroot/stdout.expected
1799 598eac43 2022-07-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1801 598eac43 2022-07-22 stsp if [ $ret -ne 0 ]; then
1802 598eac43 2022-07-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1803 50e7a649 2022-07-22 stsp test_done "$testroot" "$ret"
1807 50e7a649 2022-07-22 stsp # Original commit only had one author
1808 50e7a649 2022-07-22 stsp (cd $testroot/repo && got log -l1 -c $orig_commit2 | \
1809 50e7a649 2022-07-22 stsp egrep '^(from|via):' > $testroot/stdout)
1810 50e7a649 2022-07-22 stsp echo "from: $committer" > $testroot/stdout.expected
1811 50e7a649 2022-07-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1813 50e7a649 2022-07-22 stsp if [ $ret -ne 0 ]; then
1814 50e7a649 2022-07-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1815 50e7a649 2022-07-22 stsp test_done "$testroot" "$ret"
1819 50e7a649 2022-07-22 stsp # Author info of rebased commit should match the original
1820 50e7a649 2022-07-22 stsp (cd $testroot/repo && got log -l1 -c $new_commit2 | \
1821 50e7a649 2022-07-22 stsp egrep '^(from|via):' > $testroot/stdout)
1822 50e7a649 2022-07-22 stsp echo "from: $committer" > $testroot/stdout.expected
1824 50e7a649 2022-07-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1826 50e7a649 2022-07-22 stsp if [ $ret -ne 0 ]; then
1827 50e7a649 2022-07-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1829 442ede73 2022-09-04 stsp test_done "$testroot" "$ret"
1832 442ede73 2022-09-04 stsp test_rebase_nonbranch() {
1833 442ede73 2022-09-04 stsp local testroot=`test_init rebase_nonbranch`
1835 442ede73 2022-09-04 stsp got ref -r $testroot/repo -c refs/heads/master \
1836 442ede73 2022-09-04 stsp refs/remotes/origin/master >/dev/null
1838 442ede73 2022-09-04 stsp got checkout -b master $testroot/repo $testroot/wt >/dev/null
1840 442ede73 2022-09-04 stsp (cd $testroot/wt && got rebase origin/master > $testroot/stdout \
1841 442ede73 2022-09-04 stsp 2> $testroot/stderr)
1843 442ede73 2022-09-04 stsp if [ $ret -eq 0 ]; then
1844 442ede73 2022-09-04 stsp echo "rebase succeeded unexpectedly" >&2
1845 442ede73 2022-09-04 stsp test_done "$testroot" "1"
1848 442ede73 2022-09-04 stsp echo -n "got: will not rebase a branch which lives outside the " \
1849 442ede73 2022-09-04 stsp > $testroot/stderr.expected
1850 442ede73 2022-09-04 stsp echo '"refs/heads/" reference namespace' >> $testroot/stderr.expected
1851 442ede73 2022-09-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1853 442ede73 2022-09-04 stsp if [ $ret -ne 0 ]; then
1854 442ede73 2022-09-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
1856 598eac43 2022-07-22 stsp test_done "$testroot" "$ret"
1859 b2b3fce1 2022-10-29 op test_rebase_umask() {
1860 b2b3fce1 2022-10-29 op local testroot=`test_init rebase_umask`
1861 b2b3fce1 2022-10-29 op local commit0=`git_show_head "$testroot/repo"`
1863 b2b3fce1 2022-10-29 op got checkout "$testroot/repo" "$testroot/wt" >/dev/null
1864 b2b3fce1 2022-10-29 op (cd "$testroot/wt" && got branch newbranch) >/dev/null
1866 b2b3fce1 2022-10-29 op echo "modified alpha on branch" >$testroot/wt/alpha
1867 b2b3fce1 2022-10-29 op (cd "$testroot/wt" && got commit -m 'modified alpha on newbranch') \
1870 b2b3fce1 2022-10-29 op (cd "$testroot/wt" && got update -b master) >/dev/null
1872 b2b3fce1 2022-10-29 op if [ $ret -ne 0 ]; then
1873 b2b3fce1 2022-10-29 op echo "got update failed!" >&2
1874 b2b3fce1 2022-10-29 op test_done "$testroot" $ret
1878 b2b3fce1 2022-10-29 op echo "modified beta on master" >$testroot/wt/beta
1879 b2b3fce1 2022-10-29 op (cd "$testroot/wt" && got commit -m 'modified beta on master') \
1881 b2b3fce1 2022-10-29 op (cd "$testroot/wt" && got update) >/dev/null
1883 b2b3fce1 2022-10-29 op # using a subshell to avoid clobbering global umask
1884 b2b3fce1 2022-10-29 op (umask 077 && cd "$testroot/wt" && got rebase newbranch) >/dev/null
1886 b2b3fce1 2022-10-29 op if [ $ret -ne 0 ]; then
1887 b2b3fce1 2022-10-29 op echo "got rebase failed" >&2
1888 b2b3fce1 2022-10-29 op test_done "$testroot" $ret
1892 b2b3fce1 2022-10-29 op ls -l "$testroot/wt/alpha" | grep -q ^-rw-------
1893 b2b3fce1 2022-10-29 op if [ $? -ne 0 ]; then
1894 b2b3fce1 2022-10-29 op echo "alpha is not 0600 after rebase" >&2
1895 b2b3fce1 2022-10-29 op ls -l "$testroot/wt/alpha" >&2
1896 b2b3fce1 2022-10-29 op test_done "$testroot" 1
1900 b2b3fce1 2022-10-29 op test_done "$testroot" 0
1903 49a1ae4b 2023-01-08 stsp test_rebase_out_of_date2() {
1904 49a1ae4b 2023-01-08 stsp local testroot=`test_init rebase_out_of_date2`
1905 49a1ae4b 2023-01-08 stsp local commit0=`git_show_head $testroot/repo`
1906 49a1ae4b 2023-01-08 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
1908 49a1ae4b 2023-01-08 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1909 49a1ae4b 2023-01-08 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1910 49a1ae4b 2023-01-08 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1912 49a1ae4b 2023-01-08 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1913 49a1ae4b 2023-01-08 stsp local orig_commit2=`git_show_head $testroot/repo`
1914 49a1ae4b 2023-01-08 stsp local orig_author_time2=`git_show_author_time $testroot/repo`
1916 49a1ae4b 2023-01-08 stsp (cd $testroot/repo && git checkout -q master)
1917 49a1ae4b 2023-01-08 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1918 49a1ae4b 2023-01-08 stsp git_commit $testroot/repo -m "committing to zeta on master"
1919 49a1ae4b 2023-01-08 stsp local master_commit=`git_show_head $testroot/repo`
1921 49a1ae4b 2023-01-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1923 49a1ae4b 2023-01-08 stsp if [ $ret -ne 0 ]; then
1924 49a1ae4b 2023-01-08 stsp test_done "$testroot" "$ret"
1928 49a1ae4b 2023-01-08 stsp # Backdate the file alpha to an earlier version.
1929 49a1ae4b 2023-01-08 stsp # This sets the work tree's base commit ID back to $commit0,
1930 49a1ae4b 2023-01-08 stsp # which is out-of-date with respect to the master branch.
1931 49a1ae4b 2023-01-08 stsp (cd $testroot/wt && got update -c $commit0 alpha > /dev/null)
1933 49a1ae4b 2023-01-08 stsp # Rebase into an out-of-date work tree should be refused.
1934 49a1ae4b 2023-01-08 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
1935 49a1ae4b 2023-01-08 stsp 2> $testroot/stderr)
1937 49a1ae4b 2023-01-08 stsp if [ $ret -eq 0 ]; then
1938 49a1ae4b 2023-01-08 stsp echo "rebase succeeded unexpectedly" >&2
1939 49a1ae4b 2023-01-08 stsp test_done "$testroot" "1"
1942 49a1ae4b 2023-01-08 stsp echo -n > $testroot/stdout.expected
1943 49a1ae4b 2023-01-08 stsp echo -n "got: work tree must be updated before it can be used to " \
1944 49a1ae4b 2023-01-08 stsp > $testroot/stderr.expected
1945 49a1ae4b 2023-01-08 stsp echo "rebase a branch" >> $testroot/stderr.expected
1946 49a1ae4b 2023-01-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1948 49a1ae4b 2023-01-08 stsp if [ $ret -ne 0 ]; then
1949 49a1ae4b 2023-01-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
1951 49a1ae4b 2023-01-08 stsp test_done "$testroot" "$ret"
1954 980c6786 2023-01-31 stsp test_rebase_one_commit() {
1955 980c6786 2023-01-31 stsp local testroot=`test_init rebase_one_commit`
1957 980c6786 2023-01-31 stsp if ! got checkout $testroot/repo $testroot/wt >/dev/null; then
1958 980c6786 2023-01-31 stsp test_done "$testroot" 1
1962 980c6786 2023-01-31 stsp (cd $testroot/wt && got branch newbranch) >/dev/null
1964 980c6786 2023-01-31 stsp echo "modified alpha on newbranch" >$testroot/wt/alpha
1965 980c6786 2023-01-31 stsp (cd $testroot/wt && got commit -m 'edit alpha') >/dev/null
1966 980c6786 2023-01-31 stsp (cd $testroot/wt && got update) >/dev/null
1967 980c6786 2023-01-31 stsp local commit=`git_show_branch_head $testroot/repo newbranch`
1969 980c6786 2023-01-31 stsp echo -n '' > $testroot/stderr.expected
1971 980c6786 2023-01-31 stsp (cd $testroot/wt && got rebase master >$testroot/stdout \
1972 980c6786 2023-01-31 stsp 2> $testroot/stderr)
1974 980c6786 2023-01-31 stsp if [ $ret -ne 0 ]; then
1975 980c6786 2023-01-31 stsp echo "rebase comand failed unexpectedly" >&2
1976 980c6786 2023-01-31 stsp diff -u $testroot/stderr.expected $testroot/stderr
1977 980c6786 2023-01-31 stsp test_done "$testroot" "1"
1981 980c6786 2023-01-31 stsp echo "Forwarding refs/heads/master to commit $commit" \
1982 980c6786 2023-01-31 stsp >$testroot/stdout.expected
1983 980c6786 2023-01-31 stsp echo "Switching work tree to refs/heads/master" \
1984 980c6786 2023-01-31 stsp >> $testroot/stdout.expected
1986 980c6786 2023-01-31 stsp if ! cmp -s $testroot/stdout.expected $testroot/stdout; then
1987 980c6786 2023-01-31 stsp diff -u $testroot/stdout.expected $testroot/stdout
1988 980c6786 2023-01-31 stsp test_done "$testroot" 1
1992 980c6786 2023-01-31 stsp test_done "$testroot" 0
1995 7fb414ae 2020-08-08 stsp test_parseargs "$@"
1996 dcf44d04 2019-07-11 stsp run_test test_rebase_basic
1997 dcf44d04 2019-07-11 stsp run_test test_rebase_ancestry_check
1998 dcf44d04 2019-07-11 stsp run_test test_rebase_continue
1999 dcf44d04 2019-07-11 stsp run_test test_rebase_abort
2000 ff0d2220 2019-07-11 stsp run_test test_rebase_no_op_change
2001 7d5807f4 2019-07-11 stsp run_test test_rebase_in_progress
2002 64c6d990 2019-07-11 stsp run_test test_rebase_path_prefix
2003 787c8eb6 2019-07-11 stsp run_test test_rebase_preserves_logmsg
2004 fc66b545 2019-08-12 stsp run_test test_rebase_no_commits_to_rebase
2005 38b0338b 2019-11-29 stsp run_test test_rebase_forward
2006 0a706d22 2022-09-21 stsp run_test test_rebase_forward_path_prefix
2007 e51d7b55 2020-01-04 stsp run_test test_rebase_out_of_date
2008 1ae0a341 2020-02-14 stsp run_test test_rebase_trims_empty_dir
2009 ca6da77d 2020-03-22 stsp run_test test_rebase_delete_missing_file
2010 70551d57 2020-04-24 stsp run_test test_rebase_rm_add_rm_file
2011 598eac43 2022-07-22 stsp run_test test_rebase_resets_committer
2012 50e7a649 2022-07-22 stsp run_test test_rebase_no_author_info
2013 442ede73 2022-09-04 stsp run_test test_rebase_nonbranch
2014 b2b3fce1 2022-10-29 op run_test test_rebase_umask
2015 49a1ae4b 2023-01-08 stsp run_test test_rebase_out_of_date2
2016 980c6786 2023-01-31 stsp run_test test_rebase_one_commit
