3 5aa81393 2020-01-06 stsp # Copyright (c) 2019, 2020 Stefan Sperling <stsp@openbsd.org>
5 818c7501 2019-07-11 stsp # Permission to use, copy, modify, and distribute this software for any
6 818c7501 2019-07-11 stsp # purpose with or without fee is hereby granted, provided that the above
7 818c7501 2019-07-11 stsp # copyright notice and this permission notice appear in all copies.
9 818c7501 2019-07-11 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 818c7501 2019-07-11 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 818c7501 2019-07-11 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 818c7501 2019-07-11 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 818c7501 2019-07-11 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 818c7501 2019-07-11 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 818c7501 2019-07-11 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 818c7501 2019-07-11 stsp . ./common.sh
19 f6cae3ed 2020-09-13 naddy test_rebase_basic() {
20 818c7501 2019-07-11 stsp local testroot=`test_init rebase_basic`
21 e600f124 2021-03-21 stsp local commit0=`git_show_head $testroot/repo`
22 e600f124 2021-03-21 stsp local commit0_author_time=`git_show_author_time $testroot/repo`
24 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
25 818c7501 2019-07-11 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
26 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
28 818c7501 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
29 818c7501 2019-07-11 stsp (cd $testroot/repo && git rm -q beta)
30 818c7501 2019-07-11 stsp echo "new file on branch" > $testroot/repo/epsilon/new
31 818c7501 2019-07-11 stsp (cd $testroot/repo && git add epsilon/new)
32 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing more changes on newbranch"
34 818c7501 2019-07-11 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
35 818c7501 2019-07-11 stsp local orig_commit2=`git_show_head $testroot/repo`
36 e600f124 2021-03-21 stsp local orig_author_time2=`git_show_author_time $testroot/repo`
38 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
39 818c7501 2019-07-11 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
40 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to zeta on master"
41 818c7501 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
43 818c7501 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
45 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
46 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
50 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout)
52 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
53 818c7501 2019-07-11 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
54 818c7501 2019-07-11 stsp local new_commit2=`git_show_head $testroot/repo`
55 e600f124 2021-03-21 stsp local new_author_time2=`git_show_author_time $testroot/repo`
57 818c7501 2019-07-11 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
58 818c7501 2019-07-11 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
59 818c7501 2019-07-11 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
60 818c7501 2019-07-11 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
62 818c7501 2019-07-11 stsp echo "G gamma/delta" >> $testroot/stdout.expected
63 818c7501 2019-07-11 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
64 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
65 818c7501 2019-07-11 stsp echo ": committing to delta on newbranch" >> $testroot/stdout.expected
66 818c7501 2019-07-11 stsp echo "G alpha" >> $testroot/stdout.expected
67 818c7501 2019-07-11 stsp echo "D beta" >> $testroot/stdout.expected
68 818c7501 2019-07-11 stsp echo "A epsilon/new" >> $testroot/stdout.expected
69 818c7501 2019-07-11 stsp echo -n "$short_orig_commit2 -> $short_new_commit2" \
70 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
71 818c7501 2019-07-11 stsp echo ": committing more changes on newbranch" \
72 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
73 818c7501 2019-07-11 stsp echo "Switching work tree to refs/heads/newbranch" \
74 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
76 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
78 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
79 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
80 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
84 818c7501 2019-07-11 stsp echo "modified delta on branch" > $testroot/content.expected
85 818c7501 2019-07-11 stsp cat $testroot/wt/gamma/delta > $testroot/content
86 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
88 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
89 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
90 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
94 818c7501 2019-07-11 stsp echo "modified alpha on branch" > $testroot/content.expected
95 818c7501 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
96 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
98 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
99 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
100 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
104 818c7501 2019-07-11 stsp if [ -e $testroot/wt/beta ]; then
105 818c7501 2019-07-11 stsp echo "removed file beta still exists on disk" >&2
106 818c7501 2019-07-11 stsp test_done "$testroot" "1"
110 818c7501 2019-07-11 stsp echo "new file on branch" > $testroot/content.expected
111 818c7501 2019-07-11 stsp cat $testroot/wt/epsilon/new > $testroot/content
112 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
114 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
115 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
116 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
120 818c7501 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
122 818c7501 2019-07-11 stsp echo -n > $testroot/stdout.expected
123 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
125 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
126 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
127 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
131 818c7501 2019-07-11 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
132 818c7501 2019-07-11 stsp echo "commit $new_commit2 (newbranch)" > $testroot/stdout.expected
133 818c7501 2019-07-11 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
134 818c7501 2019-07-11 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
135 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
137 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
138 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
139 a615e0e7 2020-12-16 stsp test_done "$testroot" "$ret"
143 a615e0e7 2020-12-16 stsp (cd $testroot/wt && got update > $testroot/stdout)
145 a615e0e7 2020-12-16 stsp echo 'Already up-to-date' > $testroot/stdout.expected
146 a615e0e7 2020-12-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
148 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
149 a615e0e7 2020-12-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
150 e600f124 2021-03-21 stsp test_done "$testroot" "$ret"
154 e600f124 2021-03-21 stsp # We should have a backup of old commits
155 e600f124 2021-03-21 stsp (cd $testroot/repo && got rebase -l > $testroot/stdout)
156 fa37079f 2021-10-09 thomas local prev_LC_TIME="$LC_TIME"
157 fa37079f 2021-10-09 thomas export LC_TIME=C
158 fa37079f 2021-10-09 thomas d_orig2=`date -u -d "@$orig_author_time2" +"%a %b %e %X %Y UTC"`
159 fa37079f 2021-10-09 thomas export LC_TIME="$prev_LC_TIME"
160 180f111d 2021-09-21 thomas.ad d_new2=`date -u -d "@$new_author_time2" +"%G-%m-%d"`
161 180f111d 2021-09-21 thomas.ad d_0=`date -u -d "@$commit0_author_time" +"%G-%m-%d"`
162 e600f124 2021-03-21 stsp cat > $testroot/stdout.expected <<EOF
163 e600f124 2021-03-21 stsp -----------------------------------------------
164 e600f124 2021-03-21 stsp commit $orig_commit2 (formerly newbranch)
165 e600f124 2021-03-21 stsp from: $GOT_AUTHOR
166 e600f124 2021-03-21 stsp date: $d_orig2
168 e600f124 2021-03-21 stsp committing more changes on newbranch
170 e600f124 2021-03-21 stsp has become commit $new_commit2 (newbranch)
171 e600f124 2021-03-21 stsp $d_new2 $GOT_AUTHOR_11 committing more changes on newbranch
172 e600f124 2021-03-21 stsp history forked at $commit0
173 e600f124 2021-03-21 stsp $d_0 $GOT_AUTHOR_11 adding the test tree
175 e600f124 2021-03-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
177 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
178 e600f124 2021-03-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
179 9e822917 2021-03-23 stsp test_done "$testroot" "$ret"
183 9e822917 2021-03-23 stsp # Asking for backups of a branch which has none should yield an error
184 9e822917 2021-03-23 stsp (cd $testroot/repo && got rebase -l master \
185 9e822917 2021-03-23 stsp > $testroot/stdout 2> $testroot/stderr)
186 9e822917 2021-03-23 stsp echo -n > $testroot/stdout.expected
187 9e822917 2021-03-23 stsp echo "got: refs/got/backup/rebase/master/: no such reference found" \
188 9e822917 2021-03-23 stsp > $testroot/stderr.expected
189 9e822917 2021-03-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
191 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
192 9e822917 2021-03-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
193 9e822917 2021-03-23 stsp test_done "$testroot" "$ret"
196 9e822917 2021-03-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
198 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
199 9e822917 2021-03-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
200 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
204 643b85bc 2021-07-16 stsp # Delete all backup refs
205 643b85bc 2021-07-16 stsp (cd $testroot/repo && got rebase -X \
206 643b85bc 2021-07-16 stsp > $testroot/stdout 2> $testroot/stderr)
207 643b85bc 2021-07-16 stsp echo -n "Deleted refs/got/backup/rebase/newbranch/$new_commit2: " \
208 643b85bc 2021-07-16 stsp > $testroot/stdout.expected
209 643b85bc 2021-07-16 stsp echo "$orig_commit2" >> $testroot/stdout.expected
210 643b85bc 2021-07-16 stsp echo -n > $testroot/stderr.expected
211 643b85bc 2021-07-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
213 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
214 643b85bc 2021-07-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
215 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
218 643b85bc 2021-07-16 stsp cmp -s $testroot/stderr.expected $testroot/stderr
220 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
221 643b85bc 2021-07-16 stsp diff -u $testroot/stderr.expected $testroot/stderr
222 643b85bc 2021-07-16 stsp test_done "$testroot" "$ret"
226 643b85bc 2021-07-16 stsp (cd $testroot/repo && got rebase -l > $testroot/stdout)
227 643b85bc 2021-07-16 stsp echo -n > $testroot/stdout.expected
228 643b85bc 2021-07-16 stsp cmp -s $testroot/stdout.expected $testroot/stdout
230 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
231 643b85bc 2021-07-16 stsp diff -u $testroot/stdout.expected $testroot/stdout
233 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
236 f6cae3ed 2020-09-13 naddy test_rebase_ancestry_check() {
237 818c7501 2019-07-11 stsp local testroot=`test_init rebase_ancestry_check`
239 818c7501 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
241 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
242 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
246 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
247 818c7501 2019-07-11 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
248 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
249 82d979c5 2021-11-04 thomas local newbranch_id=`git_show_head $testroot/repo`
251 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
252 818c7501 2019-07-11 stsp 2> $testroot/stderr)
254 82d979c5 2021-11-04 thomas echo "refs/heads/newbranch is already based on refs/heads/master" \
255 82d979c5 2021-11-04 thomas > $testroot/stdout.expected
256 82d979c5 2021-11-04 thomas echo "Switching work tree from refs/heads/master to refs/heads/newbranch" \
257 82d979c5 2021-11-04 thomas >> $testroot/stdout.expected
258 82d979c5 2021-11-04 thomas echo "U gamma/delta" >> $testroot/stdout.expected
259 82d979c5 2021-11-04 thomas echo "Updated to refs/heads/newbranch: ${newbranch_id}" \
260 82d979c5 2021-11-04 thomas >> $testroot/stdout.expected
261 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
263 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
264 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
265 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
269 82d979c5 2021-11-04 thomas echo -n > $testroot/stderr.expected
270 818c7501 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
272 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
273 818c7501 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
275 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
278 f6cae3ed 2020-09-13 naddy test_rebase_continue() {
279 818c7501 2019-07-11 stsp local testroot=`test_init rebase_continue`
280 f69721c3 2019-10-21 stsp local init_commit=`git_show_head $testroot/repo`
282 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
283 818c7501 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
284 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
285 818c7501 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
286 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
288 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
289 818c7501 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
290 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
291 818c7501 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
293 818c7501 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
295 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
296 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
300 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
301 818c7501 2019-07-11 stsp 2> $testroot/stderr)
303 818c7501 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
304 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
305 a0ea4fc0 2020-02-28 stsp echo -n "$short_orig_commit1 -> merge conflict" \
306 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
307 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
308 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
310 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
311 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
312 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
316 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
317 818c7501 2019-07-11 stsp > $testroot/stderr.expected
318 818c7501 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
320 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
321 818c7501 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
322 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
326 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
327 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
328 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $init_commit" \
329 f69721c3 2019-10-21 stsp >> $testroot/content.expected
330 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
331 818c7501 2019-07-11 stsp echo "=======" >> $testroot/content.expected
332 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
333 54d5be07 2021-06-03 stsp echo ">>>>>>> merged change: commit $orig_commit1" \
334 54d5be07 2021-06-03 stsp >> $testroot/content.expected
335 818c7501 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
336 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
338 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
339 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
340 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
344 818c7501 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
346 818c7501 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
347 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
349 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
350 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
351 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
355 818c7501 2019-07-11 stsp # resolve the conflict
356 818c7501 2019-07-11 stsp echo "modified alpha on branch and master" > $testroot/wt/alpha
358 f032f1f7 2019-08-04 stsp # test interaction of 'got stage' and rebase -c
359 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got stage alpha > /dev/null)
360 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got rebase -c > $testroot/stdout \
361 f032f1f7 2019-08-04 stsp 2> $testroot/stderr)
363 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
364 f032f1f7 2019-08-04 stsp echo "rebase succeeded unexpectedly" >&2
365 f032f1f7 2019-08-04 stsp test_done "$testroot" "1"
368 f032f1f7 2019-08-04 stsp echo -n "got: work tree contains files with staged changes; " \
369 f032f1f7 2019-08-04 stsp > $testroot/stderr.expected
370 f032f1f7 2019-08-04 stsp echo "these changes must be committed or unstaged first" \
371 f032f1f7 2019-08-04 stsp >> $testroot/stderr.expected
372 f032f1f7 2019-08-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
374 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
375 f032f1f7 2019-08-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
376 f032f1f7 2019-08-04 stsp test_done "$testroot" "$ret"
380 f032f1f7 2019-08-04 stsp (cd $testroot/wt && got unstage alpha > /dev/null)
381 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase -c > $testroot/stdout)
383 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
384 818c7501 2019-07-11 stsp local new_commit1=`git_show_head $testroot/repo`
385 818c7501 2019-07-11 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
387 818c7501 2019-07-11 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
388 818c7501 2019-07-11 stsp > $testroot/stdout.expected
389 818c7501 2019-07-11 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
390 818c7501 2019-07-11 stsp echo "Switching work tree to refs/heads/newbranch" \
391 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
393 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
395 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
396 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
397 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
402 818c7501 2019-07-11 stsp (cd $testroot/wt && got log -l2 | grep ^commit > $testroot/stdout)
403 818c7501 2019-07-11 stsp echo "commit $new_commit1 (newbranch)" > $testroot/stdout.expected
404 818c7501 2019-07-11 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
405 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
407 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
408 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
410 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
413 f6cae3ed 2020-09-13 naddy test_rebase_abort() {
414 818c7501 2019-07-11 stsp local testroot=`test_init rebase_abort`
416 818c7501 2019-07-11 stsp local init_commit=`git_show_head $testroot/repo`
418 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
419 818c7501 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
420 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
421 818c7501 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
422 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
424 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
425 818c7501 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
426 818c7501 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
427 818c7501 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
429 818c7501 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
431 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
432 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
436 d52bac28 2021-10-08 thomas # unrelated unversioned file in work tree
437 d52bac28 2021-10-08 thomas touch $testroot/wt/unversioned-file
439 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
440 818c7501 2019-07-11 stsp 2> $testroot/stderr)
442 818c7501 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
443 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
444 a0ea4fc0 2020-02-28 stsp echo -n "$short_orig_commit1 -> merge conflict" \
445 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
446 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
447 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
449 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
450 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
451 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
455 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
456 818c7501 2019-07-11 stsp > $testroot/stderr.expected
457 818c7501 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
459 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
460 818c7501 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
461 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
465 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
466 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
467 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $init_commit" \
468 f69721c3 2019-10-21 stsp >> $testroot/content.expected
469 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
470 818c7501 2019-07-11 stsp echo "=======" >> $testroot/content.expected
471 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
472 54d5be07 2021-06-03 stsp echo ">>>>>>> merged change: commit $orig_commit1" \
473 54d5be07 2021-06-03 stsp >> $testroot/content.expected
474 818c7501 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
475 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
477 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
478 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
479 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
483 818c7501 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
485 818c7501 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
486 d52bac28 2021-10-08 thomas echo "? unversioned-file" >> $testroot/stdout.expected
487 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
489 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
490 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
491 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
495 818c7501 2019-07-11 stsp (cd $testroot/wt && got rebase -a > $testroot/stdout)
497 818c7501 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
499 818c7501 2019-07-11 stsp echo "Switching work tree to refs/heads/master" \
500 818c7501 2019-07-11 stsp > $testroot/stdout.expected
501 818c7501 2019-07-11 stsp echo 'R alpha' >> $testroot/stdout.expected
502 818c7501 2019-07-11 stsp echo "Rebase of refs/heads/newbranch aborted" \
503 818c7501 2019-07-11 stsp >> $testroot/stdout.expected
505 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
507 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
508 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
509 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
513 818c7501 2019-07-11 stsp echo "modified alpha on master" > $testroot/content.expected
514 818c7501 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
515 818c7501 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
517 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
518 818c7501 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
519 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
523 818c7501 2019-07-11 stsp (cd $testroot/wt && got log -l3 -c newbranch \
524 818c7501 2019-07-11 stsp | grep ^commit > $testroot/stdout)
525 818c7501 2019-07-11 stsp echo "commit $orig_commit1 (newbranch)" > $testroot/stdout.expected
526 818c7501 2019-07-11 stsp echo "commit $init_commit" >> $testroot/stdout.expected
527 818c7501 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
529 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
530 818c7501 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
532 818c7501 2019-07-11 stsp test_done "$testroot" "$ret"
535 f6cae3ed 2020-09-13 naddy test_rebase_no_op_change() {
536 ff0d2220 2019-07-11 stsp local testroot=`test_init rebase_no_op_change`
537 ff0d2220 2019-07-11 stsp local init_commit=`git_show_head $testroot/repo`
539 ff0d2220 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
540 ff0d2220 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
541 ff0d2220 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
542 ff0d2220 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
543 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
545 ff0d2220 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
546 ff0d2220 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
547 ff0d2220 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
548 ff0d2220 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
550 ff0d2220 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
552 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
553 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
557 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
558 ff0d2220 2019-07-11 stsp 2> $testroot/stderr)
560 ff0d2220 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
561 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
562 a0ea4fc0 2020-02-28 stsp echo -n "$short_orig_commit1 -> merge conflict" \
563 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
564 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
565 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
567 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
568 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
569 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
573 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
574 ff0d2220 2019-07-11 stsp > $testroot/stderr.expected
575 ff0d2220 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
577 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
578 ff0d2220 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
579 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
583 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
584 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
585 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $init_commit" \
586 f69721c3 2019-10-21 stsp >> $testroot/content.expected
587 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
588 ff0d2220 2019-07-11 stsp echo "=======" >> $testroot/content.expected
589 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
590 54d5be07 2021-06-03 stsp echo ">>>>>>> merged change: commit $orig_commit1" \
591 54d5be07 2021-06-03 stsp >> $testroot/content.expected
592 ff0d2220 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
593 ff0d2220 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
595 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
596 ff0d2220 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
597 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
601 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
603 ff0d2220 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
604 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
606 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
607 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
608 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
612 ff0d2220 2019-07-11 stsp # resolve the conflict
613 ff0d2220 2019-07-11 stsp echo "modified alpha on master" > $testroot/wt/alpha
615 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got rebase -c > $testroot/stdout)
617 ff0d2220 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
618 ff0d2220 2019-07-11 stsp local new_commit1=`git_show_head $testroot/repo`
620 ff0d2220 2019-07-11 stsp echo -n "$short_orig_commit1 -> no-op change" \
621 ff0d2220 2019-07-11 stsp > $testroot/stdout.expected
622 ff0d2220 2019-07-11 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
623 ff0d2220 2019-07-11 stsp echo "Switching work tree to refs/heads/newbranch" \
624 ff0d2220 2019-07-11 stsp >> $testroot/stdout.expected
626 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
628 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
629 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
630 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
635 ff0d2220 2019-07-11 stsp (cd $testroot/wt && got log -l2 | grep ^commit > $testroot/stdout)
636 ff0d2220 2019-07-11 stsp echo "commit $master_commit (master, newbranch)" \
637 ff0d2220 2019-07-11 stsp > $testroot/stdout.expected
638 ff0d2220 2019-07-11 stsp echo "commit $init_commit" >> $testroot/stdout.expected
639 7d5807f4 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
641 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
642 7d5807f4 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
644 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
647 f6cae3ed 2020-09-13 naddy test_rebase_in_progress() {
648 4ba9c4f6 2019-07-11 stsp local testroot=`test_init rebase_in_progress`
649 7d5807f4 2019-07-11 stsp local init_commit=`git_show_head $testroot/repo`
651 7d5807f4 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
652 7d5807f4 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
653 7d5807f4 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on newbranch"
654 7d5807f4 2019-07-11 stsp local orig_commit1=`git_show_head $testroot/repo`
655 a0ea4fc0 2020-02-28 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
657 7d5807f4 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
658 7d5807f4 2019-07-11 stsp echo "modified alpha on master" > $testroot/repo/alpha
659 7d5807f4 2019-07-11 stsp git_commit $testroot/repo -m "committing to alpha on master"
660 7d5807f4 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
662 7d5807f4 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
664 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
665 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
669 7d5807f4 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
670 7d5807f4 2019-07-11 stsp 2> $testroot/stderr)
672 7d5807f4 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
673 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
674 a0ea4fc0 2020-02-28 stsp echo -n "$short_orig_commit1 -> merge conflict" \
675 a0ea4fc0 2020-02-28 stsp >> $testroot/stdout.expected
676 a0ea4fc0 2020-02-28 stsp echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
677 7d5807f4 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
679 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
680 7d5807f4 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
681 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
685 11495e04 2019-07-12 stsp echo "got: conflicts must be resolved before rebasing can continue" \
686 7d5807f4 2019-07-11 stsp > $testroot/stderr.expected
687 7d5807f4 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
689 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
690 7d5807f4 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
691 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
695 54d5be07 2021-06-03 stsp echo '<<<<<<<' > $testroot/content.expected
696 54d5be07 2021-06-03 stsp echo "modified alpha on master" >> $testroot/content.expected
697 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $init_commit" \
698 f69721c3 2019-10-21 stsp >> $testroot/content.expected
699 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
700 7d5807f4 2019-07-11 stsp echo "=======" >> $testroot/content.expected
701 54d5be07 2021-06-03 stsp echo "modified alpha on branch" >> $testroot/content.expected
702 54d5be07 2021-06-03 stsp echo ">>>>>>> merged change: commit $orig_commit1" \
703 54d5be07 2021-06-03 stsp >> $testroot/content.expected
704 7d5807f4 2019-07-11 stsp cat $testroot/wt/alpha > $testroot/content
705 7d5807f4 2019-07-11 stsp cmp -s $testroot/content.expected $testroot/content
707 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
708 7d5807f4 2019-07-11 stsp diff -u $testroot/content.expected $testroot/content
709 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
713 7d5807f4 2019-07-11 stsp (cd $testroot/wt && got status > $testroot/stdout)
715 7d5807f4 2019-07-11 stsp echo "C alpha" > $testroot/stdout.expected
716 ff0d2220 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
718 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
719 ff0d2220 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
720 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
724 7d5807f4 2019-07-11 stsp for cmd in update commit; do
725 7d5807f4 2019-07-11 stsp (cd $testroot/wt && got $cmd > $testroot/stdout \
726 7d5807f4 2019-07-11 stsp 2> $testroot/stderr)
728 7d5807f4 2019-07-11 stsp echo -n > $testroot/stdout.expected
729 7d5807f4 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
731 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
732 7d5807f4 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
733 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
737 7d5807f4 2019-07-11 stsp echo -n "got: a rebase operation is in progress in this " \
738 7d5807f4 2019-07-11 stsp > $testroot/stderr.expected
739 7d5807f4 2019-07-11 stsp echo "work tree and must be continued or aborted first" \
740 7d5807f4 2019-07-11 stsp >> $testroot/stderr.expected
741 7d5807f4 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
743 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
744 7d5807f4 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
745 7d5807f4 2019-07-11 stsp test_done "$testroot" "$ret"
750 64c6d990 2019-07-11 stsp test_done "$testroot" "$ret"
753 f6cae3ed 2020-09-13 naddy test_rebase_path_prefix() {
754 64c6d990 2019-07-11 stsp local testroot=`test_init rebase_path_prefix`
756 64c6d990 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
757 64c6d990 2019-07-11 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
758 64c6d990 2019-07-11 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
760 64c6d990 2019-07-11 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
761 64c6d990 2019-07-11 stsp local orig_commit2=`git_show_head $testroot/repo`
763 64c6d990 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
764 64c6d990 2019-07-11 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
765 64c6d990 2019-07-11 stsp git_commit $testroot/repo -m "committing to zeta on master"
766 64c6d990 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
768 64c6d990 2019-07-11 stsp got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
770 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
771 64c6d990 2019-07-11 stsp test_done "$testroot" "$ret"
775 64c6d990 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch \
776 64c6d990 2019-07-11 stsp > $testroot/stdout 2> $testroot/stderr)
778 64c6d990 2019-07-11 stsp echo -n > $testroot/stdout.expected
779 64c6d990 2019-07-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
781 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
782 64c6d990 2019-07-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
783 64c6d990 2019-07-11 stsp test_done "$testroot" "$ret"
787 64c6d990 2019-07-11 stsp echo -n "got: cannot rebase branch which contains changes outside " \
788 64c6d990 2019-07-11 stsp > $testroot/stderr.expected
789 64c6d990 2019-07-11 stsp echo "of this work tree's path prefix" >> $testroot/stderr.expected
790 787c8eb6 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
792 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
793 787c8eb6 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
794 f4a34a66 2022-04-16 thomas test_done "$testroot" "$ret"
798 f4a34a66 2022-04-16 thomas # rebase should succeed when using a complete work tree
799 f4a34a66 2022-04-16 thomas got checkout $testroot/repo $testroot/wt2 > /dev/null
801 f4a34a66 2022-04-16 thomas if [ $ret -ne 0 ]; then
802 f4a34a66 2022-04-16 thomas test_done "$testroot" "$ret"
806 f4a34a66 2022-04-16 thomas (cd $testroot/wt2 && got rebase newbranch \
807 f4a34a66 2022-04-16 thomas > $testroot/stdout 2> $testroot/stderr)
809 f4a34a66 2022-04-16 thomas (cd $testroot/repo && git checkout -q newbranch)
810 f4a34a66 2022-04-16 thomas local new_commit1=`git_show_parent_commit $testroot/repo`
811 f4a34a66 2022-04-16 thomas local new_commit2=`git_show_head $testroot/repo`
813 f4a34a66 2022-04-16 thomas local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
814 f4a34a66 2022-04-16 thomas local short_new_commit2=`trim_obj_id 28 $new_commit2`
816 f4a34a66 2022-04-16 thomas echo "G gamma/delta" > $testroot/stdout.expected
817 f4a34a66 2022-04-16 thomas echo -n "$short_orig_commit2 -> $short_new_commit2" \
818 f4a34a66 2022-04-16 thomas >> $testroot/stdout.expected
819 f4a34a66 2022-04-16 thomas echo ": committing to delta on newbranch" \
820 f4a34a66 2022-04-16 thomas >> $testroot/stdout.expected
821 f4a34a66 2022-04-16 thomas echo "Switching work tree to refs/heads/newbranch" \
822 f4a34a66 2022-04-16 thomas >> $testroot/stdout.expected
824 f4a34a66 2022-04-16 thomas cmp -s $testroot/stdout.expected $testroot/stdout
826 f4a34a66 2022-04-16 thomas if [ $ret -ne 0 ]; then
827 f4a34a66 2022-04-16 thomas diff -u $testroot/stdout.expected $testroot/stdout
828 f4a34a66 2022-04-16 thomas test_done "$testroot" "$ret"
832 f4a34a66 2022-04-16 thomas # the first work tree should remain usable
833 f4a34a66 2022-04-16 thomas (cd $testroot/wt && got update -b master \
834 f4a34a66 2022-04-16 thomas > $testroot/stdout 2> $testroot/stderr)
836 f4a34a66 2022-04-16 thomas if [ $ret -ne 0 ]; then
837 f4a34a66 2022-04-16 thomas echo "update failed unexpectedly" >&2
838 f4a34a66 2022-04-16 thomas test_done "$testroot" "1"
842 f4a34a66 2022-04-16 thomas echo 'Already up-to-date' > $testroot/stdout.expected
843 f4a34a66 2022-04-16 thomas cmp -s $testroot/stdout.expected $testroot/stdout
845 f4a34a66 2022-04-16 thomas if [ $ret -ne 0 ]; then
846 f4a34a66 2022-04-16 thomas diff -u $testroot/stdout.expected $testroot/stdout
848 787c8eb6 2019-07-11 stsp test_done "$testroot" "$ret"
851 f6cae3ed 2020-09-13 naddy test_rebase_preserves_logmsg() {
852 787c8eb6 2019-07-11 stsp local testroot=`test_init rebase_preserves_logmsg`
854 787c8eb6 2019-07-11 stsp (cd $testroot/repo && git checkout -q -b newbranch)
855 787c8eb6 2019-07-11 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
856 787c8eb6 2019-07-11 stsp git_commit $testroot/repo -m "modified delta on newbranch"
858 787c8eb6 2019-07-11 stsp echo "modified alpha on branch" > $testroot/repo/alpha
859 787c8eb6 2019-07-11 stsp git_commit $testroot/repo -m "modified alpha on newbranch"
861 787c8eb6 2019-07-11 stsp (cd $testroot/repo && got log -c newbranch -l2 | grep -v ^date: \
862 787c8eb6 2019-07-11 stsp > $testroot/log.expected)
864 787c8eb6 2019-07-11 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
865 787c8eb6 2019-07-11 stsp local orig_commit2=`git_show_head $testroot/repo`
867 787c8eb6 2019-07-11 stsp (cd $testroot/repo && git checkout -q master)
868 787c8eb6 2019-07-11 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
869 787c8eb6 2019-07-11 stsp git_commit $testroot/repo -m "committing to zeta on master"
870 787c8eb6 2019-07-11 stsp local master_commit=`git_show_head $testroot/repo`
872 787c8eb6 2019-07-11 stsp got checkout $testroot/repo $testroot/wt > /dev/null
874 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
875 787c8eb6 2019-07-11 stsp test_done "$testroot" "$ret"
879 787c8eb6 2019-07-11 stsp (cd $testroot/wt && got rebase newbranch > /dev/null \
880 787c8eb6 2019-07-11 stsp 2> $testroot/stderr)
882 787c8eb6 2019-07-11 stsp (cd $testroot/repo && git checkout -q newbranch)
883 787c8eb6 2019-07-11 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
884 787c8eb6 2019-07-11 stsp local new_commit2=`git_show_head $testroot/repo`
886 787c8eb6 2019-07-11 stsp echo -n > $testroot/stderr.expected
887 64c6d990 2019-07-11 stsp cmp -s $testroot/stderr.expected $testroot/stderr
889 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
890 64c6d990 2019-07-11 stsp diff -u $testroot/stderr.expected $testroot/stderr
891 787c8eb6 2019-07-11 stsp test_done "$testroot" "$ret"
895 787c8eb6 2019-07-11 stsp (cd $testroot/wt && got log -c newbranch -l2 | grep -v ^date: \
896 787c8eb6 2019-07-11 stsp > $testroot/log)
897 787c8eb6 2019-07-11 stsp sed -i -e "s/$orig_commit1/$new_commit1/" $testroot/log.expected
898 787c8eb6 2019-07-11 stsp sed -i -e "s/$orig_commit2/$new_commit2/" $testroot/log.expected
899 787c8eb6 2019-07-11 stsp cmp -s $testroot/log.expected $testroot/log
901 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
902 787c8eb6 2019-07-11 stsp diff -u $testroot/log.expected $testroot/log
905 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
908 f6cae3ed 2020-09-13 naddy test_rebase_no_commits_to_rebase() {
909 fc66b545 2019-08-12 stsp local testroot=`test_init rebase_no_commits_to_rebase`
911 fc66b545 2019-08-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
913 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
914 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
918 0b36e980 2023-01-31 thomas # Create an unrelated branch with 'got import'.
919 0b36e980 2023-01-31 thomas mkdir -p $testroot/newtree
920 0b36e980 2023-01-31 thomas echo "new file" > $testroot/newtree/newfile
921 0b36e980 2023-01-31 thomas got import -m new -b newbranch -r $testroot/repo \
922 0b36e980 2023-01-31 thomas $testroot/newtree > /dev/null
924 fc66b545 2019-08-12 stsp echo "modified alpha on master" > $testroot/wt/alpha
925 fc66b545 2019-08-12 stsp (cd $testroot/wt && got commit -m 'test rebase_no_commits_to_rebase' \
926 fc66b545 2019-08-12 stsp > /dev/null)
927 fc66b545 2019-08-12 stsp (cd $testroot/wt && got update > /dev/null)
929 fc66b545 2019-08-12 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
930 fc66b545 2019-08-12 stsp 2> $testroot/stderr)
932 0b36e980 2023-01-31 thomas echo -n "got: specified branch shares no common ancestry " \
933 0b36e980 2023-01-31 thomas > $testroot/stderr.expected
934 0b36e980 2023-01-31 thomas echo "with work tree's branch" >> $testroot/stderr.expected
935 fc66b545 2019-08-12 stsp cmp -s $testroot/stderr.expected $testroot/stderr
937 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
938 fc66b545 2019-08-12 stsp diff -u $testroot/stderr.expected $testroot/stderr
939 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
943 f4a34a66 2022-04-16 thomas echo -n > $testroot/stdout.expected
944 fc66b545 2019-08-12 stsp cmp -s $testroot/stdout.expected $testroot/stdout
946 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
947 fc66b545 2019-08-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
948 fc66b545 2019-08-12 stsp test_done "$testroot" "$ret"
952 fc66b545 2019-08-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
953 fc66b545 2019-08-12 stsp echo "Already up-to-date" > $testroot/stdout.expected
954 fc66b545 2019-08-12 stsp cmp -s $testroot/stdout.expected $testroot/stdout
956 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
957 fc66b545 2019-08-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
959 ff0d2220 2019-07-11 stsp test_done "$testroot" "$ret"
962 f6cae3ed 2020-09-13 naddy test_rebase_forward() {
963 38b0338b 2019-11-29 stsp local testroot=`test_init rebase_forward`
964 38b0338b 2019-11-29 stsp local commit0=`git_show_head $testroot/repo`
966 38b0338b 2019-11-29 stsp got checkout $testroot/repo $testroot/wt > /dev/null
968 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
969 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
973 38b0338b 2019-11-29 stsp echo "change alpha 1" > $testroot/wt/alpha
974 38b0338b 2019-11-29 stsp (cd $testroot/wt && got commit -m 'test rebase_forward' \
975 38b0338b 2019-11-29 stsp > /dev/null)
976 38b0338b 2019-11-29 stsp local commit1=`git_show_head $testroot/repo`
978 38b0338b 2019-11-29 stsp echo "change alpha 2" > $testroot/wt/alpha
979 38b0338b 2019-11-29 stsp (cd $testroot/wt && got commit -m 'test rebase_forward' \
980 38b0338b 2019-11-29 stsp > /dev/null)
981 38b0338b 2019-11-29 stsp local commit2=`git_show_head $testroot/repo`
983 b6b86fd1 2022-08-30 thomas # Simulate a situation where fast-forward is required.
984 38b0338b 2019-11-29 stsp # We want to fast-forward master to origin/master:
985 38b0338b 2019-11-29 stsp # commit 3907e11dceaae2ca7f8db79c2af31794673945ad (origin/master)
986 38b0338b 2019-11-29 stsp # commit ffcffcd102cf1af6572fbdbb4cf07a0f1fd2d840 (master)
987 38b0338b 2019-11-29 stsp # commit 87a6a8a2263a15b61c016ff1720b24741d455eb5
988 993f033b 2021-07-16 stsp (cd $testroot/repo && got ref -d master >/dev/null)
989 e31abbf2 2020-03-22 stsp (cd $testroot/repo && got ref -c $commit1 refs/heads/master)
990 e31abbf2 2020-03-22 stsp (cd $testroot/repo && got ref -c $commit2 refs/remotes/origin/master)
992 38b0338b 2019-11-29 stsp (cd $testroot/wt && got up -b origin/master > /dev/null)
994 38b0338b 2019-11-29 stsp (cd $testroot/wt && got rebase master \
995 1996dd72 2022-09-21 thomas > $testroot/stdout 2> $testroot/stderr)
997 1996dd72 2022-09-21 thomas echo "Forwarding refs/heads/master to commit $commit2" \
998 1996dd72 2022-09-21 thomas > $testroot/stdout.expected
999 1996dd72 2022-09-21 thomas echo "Switching work tree to refs/heads/master" \
1000 1996dd72 2022-09-21 thomas >> $testroot/stdout.expected
1001 1996dd72 2022-09-21 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1003 1996dd72 2022-09-21 thomas if [ $ret -ne 0 ]; then
1004 1996dd72 2022-09-21 thomas diff -u $testroot/stdout.expected $testroot/stdout
1005 1996dd72 2022-09-21 thomas test_done "$testroot" "$ret"
1006 1996dd72 2022-09-21 thomas return 1
1009 1996dd72 2022-09-21 thomas # Ensure that rebase operation was completed correctly
1010 1996dd72 2022-09-21 thomas (cd $testroot/wt && got rebase -a \
1011 1996dd72 2022-09-21 thomas > $testroot/stdout 2> $testroot/stderr)
1012 1996dd72 2022-09-21 thomas echo -n "" > $testroot/stdout.expected
1013 1996dd72 2022-09-21 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1015 1996dd72 2022-09-21 thomas if [ $ret -ne 0 ]; then
1016 1996dd72 2022-09-21 thomas diff -u $testroot/stdout.expected $testroot/stdout
1017 1996dd72 2022-09-21 thomas test_done "$testroot" "$ret"
1018 1996dd72 2022-09-21 thomas return 1
1020 1996dd72 2022-09-21 thomas echo "got: rebase operation not in progress" > $testroot/stderr.expected
1021 1996dd72 2022-09-21 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1023 1996dd72 2022-09-21 thomas if [ $ret -ne 0 ]; then
1024 1996dd72 2022-09-21 thomas diff -u $testroot/stderr.expected $testroot/stderr
1025 1996dd72 2022-09-21 thomas test_done "$testroot" "$ret"
1026 1996dd72 2022-09-21 thomas return 1
1029 1996dd72 2022-09-21 thomas (cd $testroot/wt && got branch -n > $testroot/stdout)
1030 1996dd72 2022-09-21 thomas echo "master" > $testroot/stdout.expected
1031 1996dd72 2022-09-21 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1033 1996dd72 2022-09-21 thomas if [ $ret -ne 0 ]; then
1034 1996dd72 2022-09-21 thomas diff -u $testroot/stdout.expected $testroot/stdout
1035 1996dd72 2022-09-21 thomas test_done "$testroot" "$ret"
1036 1996dd72 2022-09-21 thomas return 1
1039 1996dd72 2022-09-21 thomas (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1040 1996dd72 2022-09-21 thomas echo "commit $commit2 (master, origin/master)" > $testroot/stdout.expected
1041 1996dd72 2022-09-21 thomas echo "commit $commit1" >> $testroot/stdout.expected
1042 1996dd72 2022-09-21 thomas echo "commit $commit0" >> $testroot/stdout.expected
1043 1996dd72 2022-09-21 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1045 1996dd72 2022-09-21 thomas if [ $ret -ne 0 ]; then
1046 1996dd72 2022-09-21 thomas diff -u $testroot/stdout.expected $testroot/stdout
1047 1996dd72 2022-09-21 thomas test_done "$testroot" "$ret"
1048 1996dd72 2022-09-21 thomas return 1
1051 1996dd72 2022-09-21 thomas # Forward-only rebase operations should not be backed up
1052 1996dd72 2022-09-21 thomas (cd $testroot/repo && got rebase -l > $testroot/stdout)
1053 1996dd72 2022-09-21 thomas echo -n > $testroot/stdout.expected
1054 1996dd72 2022-09-21 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1056 1996dd72 2022-09-21 thomas if [ $ret -ne 0 ]; then
1057 1996dd72 2022-09-21 thomas diff -u $testroot/stdout.expected $testroot/stdout
1059 1996dd72 2022-09-21 thomas test_done "$testroot" "$ret"
1062 1996dd72 2022-09-21 thomas test_rebase_forward_path_prefix() {
1063 1996dd72 2022-09-21 thomas local testroot=`test_init rebase_forward_path_prefix`
1064 1996dd72 2022-09-21 thomas local commit0=`git_show_head $testroot/repo`
1066 1996dd72 2022-09-21 thomas got checkout $testroot/repo $testroot/wt-full > /dev/null
1068 1996dd72 2022-09-21 thomas if [ $ret -ne 0 ]; then
1069 1996dd72 2022-09-21 thomas test_done "$testroot" "$ret"
1070 1996dd72 2022-09-21 thomas return 1
1073 1996dd72 2022-09-21 thomas echo "change alpha 1" > $testroot/wt-full/alpha
1074 1996dd72 2022-09-21 thomas (cd $testroot/wt-full && got commit -m 'test rebase_forward' \
1075 1996dd72 2022-09-21 thomas > /dev/null)
1076 1996dd72 2022-09-21 thomas local commit1=`git_show_head $testroot/repo`
1078 1996dd72 2022-09-21 thomas echo "change alpha 2" > $testroot/wt-full/alpha
1079 1996dd72 2022-09-21 thomas (cd $testroot/wt-full && got commit -m 'test rebase_forward' \
1080 1996dd72 2022-09-21 thomas > /dev/null)
1081 1996dd72 2022-09-21 thomas local commit2=`git_show_head $testroot/repo`
1083 1996dd72 2022-09-21 thomas # Simulate a situation where fast-forward is required.
1084 1996dd72 2022-09-21 thomas # We want to fast-forward master to origin/master:
1085 1996dd72 2022-09-21 thomas # commit 3907e11dceaae2ca7f8db79c2af31794673945ad (origin/master)
1086 1996dd72 2022-09-21 thomas # commit ffcffcd102cf1af6572fbdbb4cf07a0f1fd2d840 (master)
1087 1996dd72 2022-09-21 thomas # commit 87a6a8a2263a15b61c016ff1720b24741d455eb5
1088 1996dd72 2022-09-21 thomas (cd $testroot/repo && got ref -d master >/dev/null)
1089 1996dd72 2022-09-21 thomas (cd $testroot/repo && got ref -c $commit1 refs/heads/master)
1090 1996dd72 2022-09-21 thomas (cd $testroot/repo && got ref -c $commit2 refs/remotes/origin/master)
1092 1996dd72 2022-09-21 thomas # Work tree which uses a path-prefix and will be used for rebasing
1093 1996dd72 2022-09-21 thomas got checkout -p epsilon -b origin/master $testroot/repo $testroot/wt \
1094 1996dd72 2022-09-21 thomas > /dev/null
1096 1996dd72 2022-09-21 thomas if [ $ret -ne 0 ]; then
1097 1996dd72 2022-09-21 thomas test_done "$testroot" "$ret"
1098 1996dd72 2022-09-21 thomas return 1
1101 4f29e1f1 2022-10-24 thomas (cd $testroot/wt && got rebase master \
1102 38b0338b 2019-11-29 stsp > $testroot/stdout 2> $testroot/stderr)
1104 38b0338b 2019-11-29 stsp echo "Forwarding refs/heads/master to commit $commit2" \
1105 38b0338b 2019-11-29 stsp > $testroot/stdout.expected
1106 38b0338b 2019-11-29 stsp echo "Switching work tree to refs/heads/master" \
1107 38b0338b 2019-11-29 stsp >> $testroot/stdout.expected
1108 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1110 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1111 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
1112 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1116 38b0338b 2019-11-29 stsp # Ensure that rebase operation was completed correctly
1117 38b0338b 2019-11-29 stsp (cd $testroot/wt && got rebase -a \
1118 38b0338b 2019-11-29 stsp > $testroot/stdout 2> $testroot/stderr)
1119 38b0338b 2019-11-29 stsp echo -n "" > $testroot/stdout.expected
1120 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1122 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1123 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
1124 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1127 38b0338b 2019-11-29 stsp echo "got: rebase operation not in progress" > $testroot/stderr.expected
1128 38b0338b 2019-11-29 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1130 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1131 38b0338b 2019-11-29 stsp diff -u $testroot/stderr.expected $testroot/stderr
1132 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1136 da76fce2 2020-02-24 stsp (cd $testroot/wt && got branch -n > $testroot/stdout)
1137 38b0338b 2019-11-29 stsp echo "master" > $testroot/stdout.expected
1138 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1140 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1141 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
1142 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1146 38b0338b 2019-11-29 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1147 38b0338b 2019-11-29 stsp echo "commit $commit2 (master, origin/master)" > $testroot/stdout.expected
1148 38b0338b 2019-11-29 stsp echo "commit $commit1" >> $testroot/stdout.expected
1149 38b0338b 2019-11-29 stsp echo "commit $commit0" >> $testroot/stdout.expected
1150 38b0338b 2019-11-29 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1152 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1153 38b0338b 2019-11-29 stsp diff -u $testroot/stdout.expected $testroot/stdout
1154 e600f124 2021-03-21 stsp test_done "$testroot" "$ret"
1158 e600f124 2021-03-21 stsp # Forward-only rebase operations should not be backed up
1159 e600f124 2021-03-21 stsp (cd $testroot/repo && got rebase -l > $testroot/stdout)
1160 e600f124 2021-03-21 stsp echo -n > $testroot/stdout.expected
1161 e600f124 2021-03-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1163 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1164 e600f124 2021-03-21 stsp diff -u $testroot/stdout.expected $testroot/stdout
1166 38b0338b 2019-11-29 stsp test_done "$testroot" "$ret"
1169 f6cae3ed 2020-09-13 naddy test_rebase_out_of_date() {
1170 e51d7b55 2020-01-04 stsp local testroot=`test_init rebase_out_of_date`
1171 e51d7b55 2020-01-04 stsp local initial_commit=`git_show_head $testroot/repo`
1173 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1174 e51d7b55 2020-01-04 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1175 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1177 e51d7b55 2020-01-04 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1178 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git rm -q beta)
1179 e51d7b55 2020-01-04 stsp echo "new file on branch" > $testroot/repo/epsilon/new
1180 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git add epsilon/new)
1181 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing more changes on newbranch"
1183 e51d7b55 2020-01-04 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1184 e51d7b55 2020-01-04 stsp local orig_commit2=`git_show_head $testroot/repo`
1186 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git checkout -q master)
1187 e51d7b55 2020-01-04 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1188 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing to zeta on master"
1189 e51d7b55 2020-01-04 stsp local master_commit1=`git_show_head $testroot/repo`
1191 e51d7b55 2020-01-04 stsp (cd $testroot/repo && git checkout -q master)
1192 e51d7b55 2020-01-04 stsp echo "modified beta on master" > $testroot/repo/beta
1193 e51d7b55 2020-01-04 stsp git_commit $testroot/repo -m "committing to beta on master"
1194 e51d7b55 2020-01-04 stsp local master_commit2=`git_show_head $testroot/repo`
1196 e51d7b55 2020-01-04 stsp got checkout -c $master_commit1 $testroot/repo $testroot/wt \
1197 e51d7b55 2020-01-04 stsp > /dev/null
1199 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1200 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1204 e51d7b55 2020-01-04 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
1205 e51d7b55 2020-01-04 stsp 2> $testroot/stderr)
1207 e51d7b55 2020-01-04 stsp echo -n > $testroot/stdout.expected
1208 e51d7b55 2020-01-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1210 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1211 e51d7b55 2020-01-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
1212 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1216 e51d7b55 2020-01-04 stsp echo -n "got: work tree must be updated before it can be " \
1217 e51d7b55 2020-01-04 stsp > $testroot/stderr.expected
1218 e51d7b55 2020-01-04 stsp echo "used to rebase a branch" >> $testroot/stderr.expected
1219 e51d7b55 2020-01-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1221 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1222 e51d7b55 2020-01-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
1223 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1227 e51d7b55 2020-01-04 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1228 e51d7b55 2020-01-04 stsp echo "commit $master_commit2 (master)" > $testroot/stdout.expected
1229 e51d7b55 2020-01-04 stsp echo "commit $master_commit1" >> $testroot/stdout.expected
1230 e51d7b55 2020-01-04 stsp echo "commit $initial_commit" >> $testroot/stdout.expected
1231 1ae0a341 2020-02-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1233 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1234 1ae0a341 2020-02-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1236 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1239 f6cae3ed 2020-09-13 naddy test_rebase_trims_empty_dir() {
1240 1ae0a341 2020-02-14 stsp local testroot=`test_init rebase_trims_empty_dir`
1242 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1243 1ae0a341 2020-02-14 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1244 1ae0a341 2020-02-14 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1246 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git rm -q epsilon/zeta)
1247 1ae0a341 2020-02-14 stsp git_commit $testroot/repo -m "removing zeta on newbranch"
1249 1ae0a341 2020-02-14 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1250 1ae0a341 2020-02-14 stsp local orig_commit2=`git_show_head $testroot/repo`
1252 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git checkout -q master)
1253 1ae0a341 2020-02-14 stsp echo "modified alpha on master" > $testroot/repo/alpha
1254 1ae0a341 2020-02-14 stsp git_commit $testroot/repo -m "committing to alpha on master"
1255 1ae0a341 2020-02-14 stsp local master_commit=`git_show_head $testroot/repo`
1257 1ae0a341 2020-02-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1259 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1260 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1264 1ae0a341 2020-02-14 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout)
1266 1ae0a341 2020-02-14 stsp (cd $testroot/repo && git checkout -q newbranch)
1267 1ae0a341 2020-02-14 stsp local new_commit1=`git_show_parent_commit $testroot/repo`
1268 1ae0a341 2020-02-14 stsp local new_commit2=`git_show_head $testroot/repo`
1270 1ae0a341 2020-02-14 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1271 1ae0a341 2020-02-14 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1272 1ae0a341 2020-02-14 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1273 1ae0a341 2020-02-14 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1275 1ae0a341 2020-02-14 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1276 1ae0a341 2020-02-14 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
1277 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1278 1ae0a341 2020-02-14 stsp echo ": committing to delta on newbranch" >> $testroot/stdout.expected
1279 1ae0a341 2020-02-14 stsp echo "D epsilon/zeta" >> $testroot/stdout.expected
1280 1ae0a341 2020-02-14 stsp echo -n "$short_orig_commit2 -> $short_new_commit2" \
1281 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1282 1ae0a341 2020-02-14 stsp echo ": removing zeta on newbranch" \
1283 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1284 1ae0a341 2020-02-14 stsp echo "Switching work tree to refs/heads/newbranch" \
1285 1ae0a341 2020-02-14 stsp >> $testroot/stdout.expected
1287 e51d7b55 2020-01-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1289 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1290 e51d7b55 2020-01-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
1291 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1295 1ae0a341 2020-02-14 stsp echo "modified delta on branch" > $testroot/content.expected
1296 1ae0a341 2020-02-14 stsp cat $testroot/wt/gamma/delta > $testroot/content
1297 1ae0a341 2020-02-14 stsp cmp -s $testroot/content.expected $testroot/content
1299 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1300 1ae0a341 2020-02-14 stsp diff -u $testroot/content.expected $testroot/content
1301 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1305 1ae0a341 2020-02-14 stsp echo "modified alpha on master" > $testroot/content.expected
1306 1ae0a341 2020-02-14 stsp cat $testroot/wt/alpha > $testroot/content
1307 1ae0a341 2020-02-14 stsp cmp -s $testroot/content.expected $testroot/content
1309 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1310 1ae0a341 2020-02-14 stsp diff -u $testroot/content.expected $testroot/content
1311 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1315 1ae0a341 2020-02-14 stsp if [ -e $testroot/wt/epsilon ]; then
1316 1ae0a341 2020-02-14 stsp echo "parent of removed zeta still exists on disk" >&2
1317 1ae0a341 2020-02-14 stsp test_done "$testroot" "1"
1321 1ae0a341 2020-02-14 stsp (cd $testroot/wt && got status > $testroot/stdout)
1323 1ae0a341 2020-02-14 stsp echo -n > $testroot/stdout.expected
1324 1ae0a341 2020-02-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1326 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1327 1ae0a341 2020-02-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1328 1ae0a341 2020-02-14 stsp test_done "$testroot" "$ret"
1332 1ae0a341 2020-02-14 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1333 1ae0a341 2020-02-14 stsp echo "commit $new_commit2 (newbranch)" > $testroot/stdout.expected
1334 1ae0a341 2020-02-14 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
1335 1ae0a341 2020-02-14 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
1336 1ae0a341 2020-02-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1338 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1339 1ae0a341 2020-02-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1341 e51d7b55 2020-01-04 stsp test_done "$testroot" "$ret"
1344 f6cae3ed 2020-09-13 naddy test_rebase_delete_missing_file() {
1345 ca6da77d 2020-03-22 stsp local testroot=`test_init rebase_delete_missing_file`
1347 ca6da77d 2020-03-22 stsp mkdir -p $testroot/repo/d/f/g
1348 ca6da77d 2020-03-22 stsp echo "new file" > $testroot/repo/d/f/g/new
1349 ca6da77d 2020-03-22 stsp (cd $testroot/repo && git add d/f/g/new)
1350 ca6da77d 2020-03-22 stsp git_commit $testroot/repo -m "adding a subdir"
1351 ca6da77d 2020-03-22 stsp local commit0=`git_show_head $testroot/repo`
1353 a740a1b3 2020-03-22 stsp got br -r $testroot/repo -c master newbranch
1355 a740a1b3 2020-03-22 stsp got checkout -b newbranch $testroot/repo $testroot/wt > /dev/null
1357 a740a1b3 2020-03-22 stsp echo "modified delta on branch" > $testroot/wt/gamma/delta
1358 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got commit \
1359 a740a1b3 2020-03-22 stsp -m "committing to delta on newbranch" > /dev/null)
1361 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got rm beta d/f/g/new > /dev/null)
1362 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got commit \
1363 a740a1b3 2020-03-22 stsp -m "removing beta and d/f/g/new on newbranch" > /dev/null)
1365 a740a1b3 2020-03-22 stsp (cd $testroot/repo && git checkout -q newbranch)
1366 ca6da77d 2020-03-22 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1367 ca6da77d 2020-03-22 stsp local orig_commit2=`git_show_head $testroot/repo`
1369 bb494413 2021-09-28 thomas local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1370 bb494413 2021-09-28 thomas local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1372 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got update -b master > /dev/null)
1373 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got rm beta d/f/g/new > /dev/null)
1374 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got commit \
1375 a740a1b3 2020-03-22 stsp -m "removing beta and d/f/g/new on master" > /dev/null)
1377 ca6da77d 2020-03-22 stsp (cd $testroot/repo && git checkout -q master)
1378 ca6da77d 2020-03-22 stsp local master_commit=`git_show_head $testroot/repo`
1380 a740a1b3 2020-03-22 stsp (cd $testroot/wt && got update -b master > /dev/null)
1381 bb494413 2021-09-28 thomas (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
1382 bb494413 2021-09-28 thomas 2> $testroot/stderr)
1384 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1385 bb494413 2021-09-28 thomas echo "rebase succeeded unexpectedly" >&2
1386 bb494413 2021-09-28 thomas test_done "$testroot" "1"
1387 bb494413 2021-09-28 thomas return 1
1390 bb494413 2021-09-28 thomas local new_commit1=$(cd $testroot/wt && got info | \
1391 bb494413 2021-09-28 thomas grep '^work tree base commit: ' | cut -d: -f2 | tr -d ' ')
1393 ca6da77d 2020-03-22 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1394 ca6da77d 2020-03-22 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1396 ca6da77d 2020-03-22 stsp echo "G gamma/delta" >> $testroot/stdout.expected
1397 ca6da77d 2020-03-22 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
1398 ca6da77d 2020-03-22 stsp >> $testroot/stdout.expected
1399 ca6da77d 2020-03-22 stsp echo ": committing to delta on newbranch" >> $testroot/stdout.expected
1400 ca6da77d 2020-03-22 stsp echo "! beta" >> $testroot/stdout.expected
1401 ca6da77d 2020-03-22 stsp echo "! d/f/g/new" >> $testroot/stdout.expected
1402 0ef68859 2021-09-28 thomas echo -n "Files which had incoming changes but could not be found " \
1403 0ef68859 2021-09-28 thomas >> $testroot/stdout.expected
1404 0ef68859 2021-09-28 thomas echo "in the work tree: 2" >> $testroot/stdout.expected
1405 bb494413 2021-09-28 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1407 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1408 bb494413 2021-09-28 thomas diff -u $testroot/stdout.expected $testroot/stdout
1409 bb494413 2021-09-28 thomas test_done "$testroot" "$ret"
1410 bb494413 2021-09-28 thomas return 1
1413 bb494413 2021-09-28 thomas echo -n "got: changes destined for some files were not yet merged " \
1414 bb494413 2021-09-28 thomas > $testroot/stderr.expected
1415 bb494413 2021-09-28 thomas echo -n "and should be merged manually if required before the " \
1416 bb494413 2021-09-28 thomas >> $testroot/stderr.expected
1417 bb494413 2021-09-28 thomas echo "rebase operation is continued" >> $testroot/stderr.expected
1418 bb494413 2021-09-28 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1420 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1421 bb494413 2021-09-28 thomas diff -u $testroot/stderr.expected $testroot/stderr
1422 bb494413 2021-09-28 thomas test_done "$testroot" "$ret"
1423 bb494413 2021-09-28 thomas return 1
1426 bb494413 2021-09-28 thomas # ignore the missing changes and continue
1427 bb494413 2021-09-28 thomas (cd $testroot/wt && got rebase -c > $testroot/stdout)
1429 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1430 bb494413 2021-09-28 thomas echo "rebase failed unexpectedly" >&2
1431 bb494413 2021-09-28 thomas test_done "$testroot" "1"
1432 bb494413 2021-09-28 thomas return 1
1434 ca6da77d 2020-03-22 stsp echo -n "$short_orig_commit2 -> no-op change" \
1435 bb494413 2021-09-28 thomas > $testroot/stdout.expected
1436 a740a1b3 2020-03-22 stsp echo ": removing beta and d/f/g/new on newbranch" \
1437 ca6da77d 2020-03-22 stsp >> $testroot/stdout.expected
1438 ca6da77d 2020-03-22 stsp echo "Switching work tree to refs/heads/newbranch" \
1439 ca6da77d 2020-03-22 stsp >> $testroot/stdout.expected
1441 ca6da77d 2020-03-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1443 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1444 ca6da77d 2020-03-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1445 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1449 ca6da77d 2020-03-22 stsp echo "modified delta on branch" > $testroot/content.expected
1450 ca6da77d 2020-03-22 stsp cat $testroot/wt/gamma/delta > $testroot/content
1451 ca6da77d 2020-03-22 stsp cmp -s $testroot/content.expected $testroot/content
1453 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1454 ca6da77d 2020-03-22 stsp diff -u $testroot/content.expected $testroot/content
1455 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1459 ca6da77d 2020-03-22 stsp if [ -e $testroot/wt/beta ]; then
1460 ca6da77d 2020-03-22 stsp echo "removed file beta still exists on disk" >&2
1461 ca6da77d 2020-03-22 stsp test_done "$testroot" "1"
1465 ca6da77d 2020-03-22 stsp (cd $testroot/wt && got status > $testroot/stdout)
1467 ca6da77d 2020-03-22 stsp echo -n > $testroot/stdout.expected
1468 ca6da77d 2020-03-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1470 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1471 ca6da77d 2020-03-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1472 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1476 bb494413 2021-09-28 thomas (cd $testroot/repo && git checkout -q newbranch)
1477 bb494413 2021-09-28 thomas local new_commit1=`git_show_head $testroot/repo`
1478 bb494413 2021-09-28 thomas local short_new_commit1=`trim_obj_id 28 $new_commit1`
1480 ca6da77d 2020-03-22 stsp (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1481 ca6da77d 2020-03-22 stsp echo "commit $new_commit1 (newbranch)" > $testroot/stdout.expected
1482 ca6da77d 2020-03-22 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
1483 ca6da77d 2020-03-22 stsp echo "commit $commit0" >> $testroot/stdout.expected
1484 70551d57 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1486 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1487 70551d57 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1489 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1492 f6cae3ed 2020-09-13 naddy test_rebase_rm_add_rm_file() {
1493 70551d57 2020-04-24 stsp local testroot=`test_init rebase_rm_add_rm_file`
1495 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1496 70551d57 2020-04-24 stsp (cd $testroot/repo && git rm -q beta)
1497 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "removing beta from newbranch"
1498 70551d57 2020-04-24 stsp local orig_commit1=`git_show_head $testroot/repo`
1500 70551d57 2020-04-24 stsp echo 'restored beta' > $testroot/repo/beta
1501 70551d57 2020-04-24 stsp (cd $testroot/repo && git add beta)
1502 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "restoring beta on newbranch"
1503 70551d57 2020-04-24 stsp local orig_commit2=`git_show_head $testroot/repo`
1505 70551d57 2020-04-24 stsp (cd $testroot/repo && git rm -q beta)
1506 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "removing beta from newbranch again"
1507 70551d57 2020-04-24 stsp local orig_commit3=`git_show_head $testroot/repo`
1509 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q master)
1510 70551d57 2020-04-24 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1511 70551d57 2020-04-24 stsp git_commit $testroot/repo -m "committing to zeta on master"
1512 70551d57 2020-04-24 stsp local master_commit=`git_show_head $testroot/repo`
1514 70551d57 2020-04-24 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1516 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1517 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1521 70551d57 2020-04-24 stsp (cd $testroot/wt && got rebase newbranch > $testroot/stdout)
1523 70551d57 2020-04-24 stsp # this would error out with 'got: file index is corrupt'
1524 70551d57 2020-04-24 stsp (cd $testroot/wt && got status > /dev/null)
1526 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1527 70551d57 2020-04-24 stsp echo "got status command failed unexpectedly" >&2
1528 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1532 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q newbranch)
1533 70551d57 2020-04-24 stsp local new_commit3=`git_show_head $testroot/repo`
1534 70551d57 2020-04-24 stsp local new_commit2=`git_show_parent_commit $testroot/repo`
1535 70551d57 2020-04-24 stsp local new_commit1=`git_show_parent_commit $testroot/repo $new_commit2`
1537 70551d57 2020-04-24 stsp (cd $testroot/repo && git checkout -q newbranch)
1539 70551d57 2020-04-24 stsp local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1540 70551d57 2020-04-24 stsp local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1541 70551d57 2020-04-24 stsp local short_orig_commit3=`trim_obj_id 28 $orig_commit3`
1542 70551d57 2020-04-24 stsp local short_new_commit1=`trim_obj_id 28 $new_commit1`
1543 70551d57 2020-04-24 stsp local short_new_commit2=`trim_obj_id 28 $new_commit2`
1544 70551d57 2020-04-24 stsp local short_new_commit3=`trim_obj_id 28 $new_commit3`
1546 70551d57 2020-04-24 stsp echo "D beta" > $testroot/stdout.expected
1547 70551d57 2020-04-24 stsp echo -n "$short_orig_commit1 -> $short_new_commit1" \
1548 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1549 70551d57 2020-04-24 stsp echo ": removing beta from newbranch" >> $testroot/stdout.expected
1550 70551d57 2020-04-24 stsp echo "A beta" >> $testroot/stdout.expected
1551 70551d57 2020-04-24 stsp echo -n "$short_orig_commit2 -> $short_new_commit2" \
1552 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1553 70551d57 2020-04-24 stsp echo ": restoring beta on newbranch" >> $testroot/stdout.expected
1554 70551d57 2020-04-24 stsp echo "D beta" >> $testroot/stdout.expected
1555 70551d57 2020-04-24 stsp echo -n "$short_orig_commit3 -> $short_new_commit3" \
1556 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1557 70551d57 2020-04-24 stsp echo ": removing beta from newbranch again" >> $testroot/stdout.expected
1558 70551d57 2020-04-24 stsp echo "Switching work tree to refs/heads/newbranch" \
1559 70551d57 2020-04-24 stsp >> $testroot/stdout.expected
1561 ca6da77d 2020-03-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1563 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1564 ca6da77d 2020-03-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1565 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1569 70551d57 2020-04-24 stsp (cd $testroot/wt && got status > $testroot/stdout)
1571 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1572 70551d57 2020-04-24 stsp echo "got status command failed unexpectedly" >&2
1573 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1577 70551d57 2020-04-24 stsp echo -n > $testroot/stdout.expected
1578 70551d57 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1580 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1581 70551d57 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1582 70551d57 2020-04-24 stsp test_done "$testroot" "$ret"
1586 70551d57 2020-04-24 stsp (cd $testroot/wt && got log -l4 | grep ^commit > $testroot/stdout)
1587 70551d57 2020-04-24 stsp echo "commit $new_commit3 (newbranch)" > $testroot/stdout.expected
1588 70551d57 2020-04-24 stsp echo "commit $new_commit2" >> $testroot/stdout.expected
1589 70551d57 2020-04-24 stsp echo "commit $new_commit1" >> $testroot/stdout.expected
1590 70551d57 2020-04-24 stsp echo "commit $master_commit (master)" >> $testroot/stdout.expected
1591 70551d57 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1593 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1594 70551d57 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
1596 ca6da77d 2020-03-22 stsp test_done "$testroot" "$ret"
1599 150d7275 2022-07-22 thomas test_rebase_resets_committer() {
1600 150d7275 2022-07-22 thomas local testroot=`test_init rebase_resets_committer`
1601 150d7275 2022-07-22 thomas local commit0=`git_show_head $testroot/repo`
1602 150d7275 2022-07-22 thomas local commit0_author_time=`git_show_author_time $testroot/repo`
1603 150d7275 2022-07-22 thomas local committer="Flan Luck <flan_luck@openbsd.org>"
1605 150d7275 2022-07-22 thomas (cd $testroot/repo && git checkout -q -b newbranch)
1606 150d7275 2022-07-22 thomas echo "modified delta on branch" > $testroot/repo/gamma/delta
1607 150d7275 2022-07-22 thomas git_commit $testroot/repo -m "committing to delta on newbranch"
1609 150d7275 2022-07-22 thomas echo "modified alpha on branch" > $testroot/repo/alpha
1610 150d7275 2022-07-22 thomas git_commit $testroot/repo -m "committing more changes on newbranch"
1612 150d7275 2022-07-22 thomas local orig_commit1=`git_show_parent_commit $testroot/repo`
1613 150d7275 2022-07-22 thomas local orig_commit2=`git_show_head $testroot/repo`
1614 150d7275 2022-07-22 thomas local orig_author_time2=`git_show_author_time $testroot/repo`
1616 150d7275 2022-07-22 thomas (cd $testroot/repo && git checkout -q master)
1617 150d7275 2022-07-22 thomas echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1618 150d7275 2022-07-22 thomas git_commit $testroot/repo -m "committing to zeta on master"
1619 150d7275 2022-07-22 thomas local master_commit=`git_show_head $testroot/repo`
1621 150d7275 2022-07-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1623 150d7275 2022-07-22 thomas if [ $ret -ne 0 ]; then
1624 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
1625 150d7275 2022-07-22 thomas return 1
1628 150d7275 2022-07-22 thomas (cd $testroot/wt && env GOT_AUTHOR="$committer" \
1629 150d7275 2022-07-22 thomas got rebase newbranch > $testroot/stdout)
1631 150d7275 2022-07-22 thomas (cd $testroot/repo && git checkout -q newbranch)
1632 150d7275 2022-07-22 thomas local new_commit1=`git_show_parent_commit $testroot/repo`
1633 150d7275 2022-07-22 thomas local new_commit2=`git_show_head $testroot/repo`
1634 150d7275 2022-07-22 thomas local new_author_time2=`git_show_author_time $testroot/repo`
1636 150d7275 2022-07-22 thomas local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1637 150d7275 2022-07-22 thomas local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1638 150d7275 2022-07-22 thomas local short_new_commit1=`trim_obj_id 28 $new_commit1`
1639 150d7275 2022-07-22 thomas local short_new_commit2=`trim_obj_id 28 $new_commit2`
1641 150d7275 2022-07-22 thomas echo "G gamma/delta" >> $testroot/stdout.expected
1642 150d7275 2022-07-22 thomas echo -n "$short_orig_commit1 -> $short_new_commit1" \
1643 150d7275 2022-07-22 thomas >> $testroot/stdout.expected
1644 150d7275 2022-07-22 thomas echo ": committing to delta on newbranch" >> $testroot/stdout.expected
1645 150d7275 2022-07-22 thomas echo "G alpha" >> $testroot/stdout.expected
1646 150d7275 2022-07-22 thomas echo -n "$short_orig_commit2 -> $short_new_commit2" \
1647 150d7275 2022-07-22 thomas >> $testroot/stdout.expected
1648 150d7275 2022-07-22 thomas echo ": committing more changes on newbranch" \
1649 150d7275 2022-07-22 thomas >> $testroot/stdout.expected
1650 150d7275 2022-07-22 thomas echo "Switching work tree to refs/heads/newbranch" \
1651 150d7275 2022-07-22 thomas >> $testroot/stdout.expected
1653 150d7275 2022-07-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1655 150d7275 2022-07-22 thomas if [ $ret -ne 0 ]; then
1656 150d7275 2022-07-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1657 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
1658 150d7275 2022-07-22 thomas return 1
1661 150d7275 2022-07-22 thomas # Original commit only had one author
1662 150d7275 2022-07-22 thomas (cd $testroot/repo && got log -l1 -c $orig_commit2 | \
1663 150d7275 2022-07-22 thomas egrep '^(from|via):' > $testroot/stdout)
1664 150d7275 2022-07-22 thomas echo "from: $GOT_AUTHOR" > $testroot/stdout.expected
1665 150d7275 2022-07-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1667 150d7275 2022-07-22 thomas if [ $ret -ne 0 ]; then
1668 150d7275 2022-07-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1669 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
1670 150d7275 2022-07-22 thomas return 1
1673 150d7275 2022-07-22 thomas # Rebased commit should have new committer name added
1674 150d7275 2022-07-22 thomas (cd $testroot/repo && got log -l1 -c $new_commit2 | \
1675 150d7275 2022-07-22 thomas egrep '^(from|via):' > $testroot/stdout)
1676 150d7275 2022-07-22 thomas echo "from: $GOT_AUTHOR" > $testroot/stdout.expected
1677 150d7275 2022-07-22 thomas echo "via: $committer" >> $testroot/stdout.expected
1679 8db00f97 2022-07-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1681 8db00f97 2022-07-22 thomas if [ $ret -ne 0 ]; then
1682 8db00f97 2022-07-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1684 8db00f97 2022-07-22 thomas test_done "$testroot" "$ret"
1687 8db00f97 2022-07-22 thomas test_rebase_no_author_info() {
1688 8db00f97 2022-07-22 thomas local testroot=`test_init rebase_no_author_info`
1689 8db00f97 2022-07-22 thomas local commit0=`git_show_head $testroot/repo`
1690 8db00f97 2022-07-22 thomas local commit0_author_time=`git_show_author_time $testroot/repo`
1691 8db00f97 2022-07-22 thomas local committer="$GOT_AUTHOR"
1693 8db00f97 2022-07-22 thomas (cd $testroot/repo && git checkout -q -b newbranch)
1694 8db00f97 2022-07-22 thomas echo "modified delta on branch" > $testroot/repo/gamma/delta
1695 8db00f97 2022-07-22 thomas git_commit $testroot/repo -m "committing to delta on newbranch"
1697 8db00f97 2022-07-22 thomas echo "modified alpha on branch" > $testroot/repo/alpha
1698 8db00f97 2022-07-22 thomas git_commit $testroot/repo -m "committing more changes on newbranch"
1700 8db00f97 2022-07-22 thomas local orig_commit1=`git_show_parent_commit $testroot/repo`
1701 8db00f97 2022-07-22 thomas local orig_commit2=`git_show_head $testroot/repo`
1702 8db00f97 2022-07-22 thomas local orig_author_time2=`git_show_author_time $testroot/repo`
1704 8db00f97 2022-07-22 thomas (cd $testroot/repo && git checkout -q master)
1705 8db00f97 2022-07-22 thomas echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1706 8db00f97 2022-07-22 thomas git_commit $testroot/repo -m "committing to zeta on master"
1707 8db00f97 2022-07-22 thomas local master_commit=`git_show_head $testroot/repo`
1709 8db00f97 2022-07-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1711 8db00f97 2022-07-22 thomas if [ $ret -ne 0 ]; then
1712 8db00f97 2022-07-22 thomas test_done "$testroot" "$ret"
1713 8db00f97 2022-07-22 thomas return 1
1716 95ad1e7d 2022-07-24 thomas # unset in a subshell to avoid affecting our environment
1717 95ad1e7d 2022-07-24 thomas (unset GOT_AUTHOR && cd $testroot/wt && \
1718 95ad1e7d 2022-07-24 thomas got rebase newbranch > $testroot/stdout)
1720 8db00f97 2022-07-22 thomas (cd $testroot/repo && git checkout -q newbranch)
1721 8db00f97 2022-07-22 thomas local new_commit1=`git_show_parent_commit $testroot/repo`
1722 8db00f97 2022-07-22 thomas local new_commit2=`git_show_head $testroot/repo`
1723 8db00f97 2022-07-22 thomas local new_author_time2=`git_show_author_time $testroot/repo`
1725 8db00f97 2022-07-22 thomas local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1726 8db00f97 2022-07-22 thomas local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1727 8db00f97 2022-07-22 thomas local short_new_commit1=`trim_obj_id 28 $new_commit1`
1728 8db00f97 2022-07-22 thomas local short_new_commit2=`trim_obj_id 28 $new_commit2`
1730 8db00f97 2022-07-22 thomas echo "G gamma/delta" >> $testroot/stdout.expected
1731 8db00f97 2022-07-22 thomas echo -n "$short_orig_commit1 -> $short_new_commit1" \
1732 8db00f97 2022-07-22 thomas >> $testroot/stdout.expected
1733 8db00f97 2022-07-22 thomas echo ": committing to delta on newbranch" >> $testroot/stdout.expected
1734 8db00f97 2022-07-22 thomas echo "G alpha" >> $testroot/stdout.expected
1735 8db00f97 2022-07-22 thomas echo -n "$short_orig_commit2 -> $short_new_commit2" \
1736 8db00f97 2022-07-22 thomas >> $testroot/stdout.expected
1737 8db00f97 2022-07-22 thomas echo ": committing more changes on newbranch" \
1738 8db00f97 2022-07-22 thomas >> $testroot/stdout.expected
1739 8db00f97 2022-07-22 thomas echo "Switching work tree to refs/heads/newbranch" \
1740 8db00f97 2022-07-22 thomas >> $testroot/stdout.expected
1742 150d7275 2022-07-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1744 150d7275 2022-07-22 thomas if [ $ret -ne 0 ]; then
1745 150d7275 2022-07-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1746 8db00f97 2022-07-22 thomas test_done "$testroot" "$ret"
1747 8db00f97 2022-07-22 thomas return 1
1750 8db00f97 2022-07-22 thomas # Original commit only had one author
1751 8db00f97 2022-07-22 thomas (cd $testroot/repo && got log -l1 -c $orig_commit2 | \
1752 8db00f97 2022-07-22 thomas egrep '^(from|via):' > $testroot/stdout)
1753 8db00f97 2022-07-22 thomas echo "from: $committer" > $testroot/stdout.expected
1754 8db00f97 2022-07-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1756 8db00f97 2022-07-22 thomas if [ $ret -ne 0 ]; then
1757 8db00f97 2022-07-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1758 8db00f97 2022-07-22 thomas test_done "$testroot" "$ret"
1759 8db00f97 2022-07-22 thomas return 1
1762 8db00f97 2022-07-22 thomas # Author info of rebased commit should match the original
1763 8db00f97 2022-07-22 thomas (cd $testroot/repo && got log -l1 -c $new_commit2 | \
1764 8db00f97 2022-07-22 thomas egrep '^(from|via):' > $testroot/stdout)
1765 8db00f97 2022-07-22 thomas echo "from: $committer" > $testroot/stdout.expected
1767 8db00f97 2022-07-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1769 8db00f97 2022-07-22 thomas if [ $ret -ne 0 ]; then
1770 8db00f97 2022-07-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1772 8dbcf388 2022-09-04 thomas test_done "$testroot" "$ret"
1775 8dbcf388 2022-09-04 thomas test_rebase_nonbranch() {
1776 8dbcf388 2022-09-04 thomas local testroot=`test_init rebase_nonbranch`
1778 8dbcf388 2022-09-04 thomas got ref -r $testroot/repo -c refs/heads/master \
1779 8dbcf388 2022-09-04 thomas refs/remotes/origin/master >/dev/null
1781 8dbcf388 2022-09-04 thomas got checkout -b master $testroot/repo $testroot/wt >/dev/null
1783 8dbcf388 2022-09-04 thomas (cd $testroot/wt && got rebase origin/master > $testroot/stdout \
1784 8dbcf388 2022-09-04 thomas 2> $testroot/stderr)
1786 8dbcf388 2022-09-04 thomas if [ $ret -eq 0 ]; then
1787 8dbcf388 2022-09-04 thomas echo "rebase succeeded unexpectedly" >&2
1788 8dbcf388 2022-09-04 thomas test_done "$testroot" "1"
1789 8dbcf388 2022-09-04 thomas return 1
1791 8dbcf388 2022-09-04 thomas echo -n "got: will not rebase a branch which lives outside the " \
1792 8dbcf388 2022-09-04 thomas > $testroot/stderr.expected
1793 8dbcf388 2022-09-04 thomas echo '"refs/heads/" reference namespace' >> $testroot/stderr.expected
1794 8dbcf388 2022-09-04 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1796 8dbcf388 2022-09-04 thomas if [ $ret -ne 0 ]; then
1797 8dbcf388 2022-09-04 thomas diff -u $testroot/stderr.expected $testroot/stderr
1799 150d7275 2022-07-22 thomas test_done "$testroot" "$ret"
1802 a2c162eb 2022-10-30 thomas test_rebase_umask() {
1803 a2c162eb 2022-10-30 thomas local testroot=`test_init rebase_umask`
1804 a2c162eb 2022-10-30 thomas local commit0=`git_show_head "$testroot/repo"`
1806 a2c162eb 2022-10-30 thomas got checkout "$testroot/repo" "$testroot/wt" >/dev/null
1807 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got branch newbranch) >/dev/null
1809 a2c162eb 2022-10-30 thomas echo "modified alpha on branch" >$testroot/wt/alpha
1810 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got commit -m 'modified alpha on newbranch') \
1811 a2c162eb 2022-10-30 thomas >/dev/null
1813 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got update -b master) >/dev/null
1815 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
1816 a2c162eb 2022-10-30 thomas echo "got update failed!" >&2
1817 a2c162eb 2022-10-30 thomas test_done "$testroot" $ret
1818 a2c162eb 2022-10-30 thomas return 1
1821 a2c162eb 2022-10-30 thomas echo "modified beta on master" >$testroot/wt/beta
1822 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got commit -m 'modified beta on master') \
1823 a2c162eb 2022-10-30 thomas >/dev/null
1824 a2c162eb 2022-10-30 thomas (cd "$testroot/wt" && got update) >/dev/null
1826 a2c162eb 2022-10-30 thomas # using a subshell to avoid clobbering global umask
1827 a2c162eb 2022-10-30 thomas (umask 077 && cd "$testroot/wt" && got rebase newbranch) >/dev/null
1829 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
1830 a2c162eb 2022-10-30 thomas echo "got rebase failed" >&2
1831 a2c162eb 2022-10-30 thomas test_done "$testroot" $ret
1832 a2c162eb 2022-10-30 thomas return 1
1835 a2c162eb 2022-10-30 thomas ls -l "$testroot/wt/alpha" | grep -q ^-rw-------
1836 a2c162eb 2022-10-30 thomas if [ $? -ne 0 ]; then
1837 a2c162eb 2022-10-30 thomas echo "alpha is not 0600 after rebase" >&2
1838 a2c162eb 2022-10-30 thomas ls -l "$testroot/wt/alpha" >&2
1839 a2c162eb 2022-10-30 thomas test_done "$testroot" 1
1840 a2c162eb 2022-10-30 thomas return 1
1843 a2c162eb 2022-10-30 thomas test_done "$testroot" 0
1846 60db6857 2023-01-08 thomas test_rebase_out_of_date2() {
1847 60db6857 2023-01-08 thomas local testroot=`test_init rebase_out_of_date2`
1848 60db6857 2023-01-08 thomas local commit0=`git_show_head $testroot/repo`
1849 60db6857 2023-01-08 thomas local commit0_author_time=`git_show_author_time $testroot/repo`
1851 60db6857 2023-01-08 thomas (cd $testroot/repo && git checkout -q -b newbranch)
1852 60db6857 2023-01-08 thomas echo "modified delta on branch" > $testroot/repo/gamma/delta
1853 60db6857 2023-01-08 thomas git_commit $testroot/repo -m "committing to delta on newbranch"
1855 60db6857 2023-01-08 thomas local orig_commit1=`git_show_parent_commit $testroot/repo`
1856 60db6857 2023-01-08 thomas local orig_commit2=`git_show_head $testroot/repo`
1857 60db6857 2023-01-08 thomas local orig_author_time2=`git_show_author_time $testroot/repo`
1859 60db6857 2023-01-08 thomas (cd $testroot/repo && git checkout -q master)
1860 60db6857 2023-01-08 thomas echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1861 60db6857 2023-01-08 thomas git_commit $testroot/repo -m "committing to zeta on master"
1862 60db6857 2023-01-08 thomas local master_commit=`git_show_head $testroot/repo`
1864 60db6857 2023-01-08 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1866 60db6857 2023-01-08 thomas if [ $ret -ne 0 ]; then
1867 60db6857 2023-01-08 thomas test_done "$testroot" "$ret"
1868 60db6857 2023-01-08 thomas return 1
1871 60db6857 2023-01-08 thomas # Backdate the file alpha to an earlier version.
1872 60db6857 2023-01-08 thomas # This sets the work tree's base commit ID back to $commit0,
1873 60db6857 2023-01-08 thomas # which is out-of-date with respect to the master branch.
1874 60db6857 2023-01-08 thomas (cd $testroot/wt && got update -c $commit0 alpha > /dev/null)
1876 60db6857 2023-01-08 thomas # Rebase into an out-of-date work tree should be refused.
1877 60db6857 2023-01-08 thomas (cd $testroot/wt && got rebase newbranch > $testroot/stdout \
1878 60db6857 2023-01-08 thomas 2> $testroot/stderr)
1880 60db6857 2023-01-08 thomas if [ $ret -eq 0 ]; then
1881 60db6857 2023-01-08 thomas echo "rebase succeeded unexpectedly" >&2
1882 60db6857 2023-01-08 thomas test_done "$testroot" "1"
1883 60db6857 2023-01-08 thomas return 1
1885 60db6857 2023-01-08 thomas echo -n > $testroot/stdout.expected
1886 60db6857 2023-01-08 thomas echo -n "got: work tree must be updated before it can be used to " \
1887 60db6857 2023-01-08 thomas > $testroot/stderr.expected
1888 60db6857 2023-01-08 thomas echo "rebase a branch" >> $testroot/stderr.expected
1889 60db6857 2023-01-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1891 60db6857 2023-01-08 thomas if [ $ret -ne 0 ]; then
1892 60db6857 2023-01-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
1894 60db6857 2023-01-08 thomas test_done "$testroot" "$ret"
1897 0b36e980 2023-01-31 thomas test_rebase_one_commit() {
1898 0b36e980 2023-01-31 thomas local testroot=`test_init rebase_one_commit`
1900 0b36e980 2023-01-31 thomas if ! got checkout $testroot/repo $testroot/wt >/dev/null; then
1901 0b36e980 2023-01-31 thomas test_done "$testroot" 1
1902 0b36e980 2023-01-31 thomas return 1
1905 0b36e980 2023-01-31 thomas (cd $testroot/wt && got branch newbranch) >/dev/null
1907 0b36e980 2023-01-31 thomas echo "modified alpha on newbranch" >$testroot/wt/alpha
1908 0b36e980 2023-01-31 thomas (cd $testroot/wt && got commit -m 'edit alpha') >/dev/null
1909 0b36e980 2023-01-31 thomas (cd $testroot/wt && got update) >/dev/null
1910 0b36e980 2023-01-31 thomas local commit=`git_show_branch_head $testroot/repo newbranch`
1912 0b36e980 2023-01-31 thomas echo -n '' > $testroot/stderr.expected
1914 0b36e980 2023-01-31 thomas (cd $testroot/wt && got rebase master >$testroot/stdout \
1915 0b36e980 2023-01-31 thomas 2> $testroot/stderr)
1917 0b36e980 2023-01-31 thomas if [ $ret -ne 0 ]; then
1918 0b36e980 2023-01-31 thomas echo "rebase comand failed unexpectedly" >&2
1919 0b36e980 2023-01-31 thomas diff -u $testroot/stderr.expected $testroot/stderr
1920 0b36e980 2023-01-31 thomas test_done "$testroot" "1"
1921 0b36e980 2023-01-31 thomas return 1
1924 0b36e980 2023-01-31 thomas echo "Forwarding refs/heads/master to commit $commit" \
1925 0b36e980 2023-01-31 thomas >$testroot/stdout.expected
1926 0b36e980 2023-01-31 thomas echo "Switching work tree to refs/heads/master" \
1927 0b36e980 2023-01-31 thomas >> $testroot/stdout.expected
1929 0b36e980 2023-01-31 thomas if ! cmp -s $testroot/stdout.expected $testroot/stdout; then
1930 0b36e980 2023-01-31 thomas diff -u $testroot/stdout.expected $testroot/stdout
1931 0b36e980 2023-01-31 thomas test_done "$testroot" 1
1932 0b36e980 2023-01-31 thomas return 1
1935 0b36e980 2023-01-31 thomas test_done "$testroot" 0
1938 7fb414ae 2020-08-08 stsp test_parseargs "$@"
1939 dcf44d04 2019-07-11 stsp run_test test_rebase_basic
1940 dcf44d04 2019-07-11 stsp run_test test_rebase_ancestry_check
1941 dcf44d04 2019-07-11 stsp run_test test_rebase_continue
1942 dcf44d04 2019-07-11 stsp run_test test_rebase_abort
1943 ff0d2220 2019-07-11 stsp run_test test_rebase_no_op_change
1944 7d5807f4 2019-07-11 stsp run_test test_rebase_in_progress
1945 64c6d990 2019-07-11 stsp run_test test_rebase_path_prefix
1946 787c8eb6 2019-07-11 stsp run_test test_rebase_preserves_logmsg
1947 fc66b545 2019-08-12 stsp run_test test_rebase_no_commits_to_rebase
1948 38b0338b 2019-11-29 stsp run_test test_rebase_forward
1949 1996dd72 2022-09-21 thomas run_test test_rebase_forward_path_prefix
1950 e51d7b55 2020-01-04 stsp run_test test_rebase_out_of_date
1951 1ae0a341 2020-02-14 stsp run_test test_rebase_trims_empty_dir
1952 ca6da77d 2020-03-22 stsp run_test test_rebase_delete_missing_file
1953 70551d57 2020-04-24 stsp run_test test_rebase_rm_add_rm_file
1954 150d7275 2022-07-22 thomas run_test test_rebase_resets_committer
1955 8db00f97 2022-07-22 thomas run_test test_rebase_no_author_info
1956 8dbcf388 2022-09-04 thomas run_test test_rebase_nonbranch
1957 a2c162eb 2022-10-30 thomas run_test test_rebase_umask
1958 60db6857 2023-01-08 thomas run_test test_rebase_out_of_date2
1959 0b36e980 2023-01-31 thomas run_test test_rebase_one_commit
