1 818c7501 2019-07-11 stsp #!/bin/sh
   2 818c7501 2019-07-11 stsp #
   3 5aa81393 2020-01-06 stsp # Copyright (c) 2019, 2020 Stefan Sperling <stsp@openbsd.org>
   4 818c7501 2019-07-11 stsp #
   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.
   8 818c7501 2019-07-11 stsp #
   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.
  16 818c7501 2019-07-11 stsp 
  17 818c7501 2019-07-11 stsp . ./common.sh
  18 818c7501 2019-07-11 stsp 
  19 818c7501 2019-07-11 stsp function test_rebase_basic {
  20 818c7501 2019-07-11 stsp 	local testroot=`test_init rebase_basic`
  21 818c7501 2019-07-11 stsp 
  22 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
  23 818c7501 2019-07-11 stsp 	echo "modified delta on branch" > $testroot/repo/gamma/delta
  24 818c7501 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to delta on newbranch"
  25 818c7501 2019-07-11 stsp 
  26 818c7501 2019-07-11 stsp 	echo "modified alpha on branch" > $testroot/repo/alpha
  27 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git rm -q beta)
  28 818c7501 2019-07-11 stsp 	echo "new file on branch" > $testroot/repo/epsilon/new
  29 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git add epsilon/new)
  30 818c7501 2019-07-11 stsp 	git_commit $testroot/repo -m "committing more changes on newbranch"
  31 818c7501 2019-07-11 stsp 
  32 818c7501 2019-07-11 stsp 	local orig_commit1=`git_show_parent_commit $testroot/repo`
  33 818c7501 2019-07-11 stsp 	local orig_commit2=`git_show_head $testroot/repo`
  34 818c7501 2019-07-11 stsp 
  35 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q master)
  36 818c7501 2019-07-11 stsp 	echo "modified zeta on master" > $testroot/repo/epsilon/zeta
  37 818c7501 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to zeta on master"
  38 818c7501 2019-07-11 stsp 	local master_commit=`git_show_head $testroot/repo`
  39 818c7501 2019-07-11 stsp 
  40 818c7501 2019-07-11 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
  41 818c7501 2019-07-11 stsp 	ret="$?"
  42 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
  43 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
  44 818c7501 2019-07-11 stsp 		return 1
  45 818c7501 2019-07-11 stsp 	fi
  46 818c7501 2019-07-11 stsp 
  47 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got rebase newbranch > $testroot/stdout)
  48 818c7501 2019-07-11 stsp 
  49 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q newbranch)
  50 818c7501 2019-07-11 stsp 	local new_commit1=`git_show_parent_commit $testroot/repo`
  51 818c7501 2019-07-11 stsp 	local new_commit2=`git_show_head $testroot/repo`
  52 818c7501 2019-07-11 stsp 
  53 818c7501 2019-07-11 stsp 	local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
  54 818c7501 2019-07-11 stsp 	local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
  55 818c7501 2019-07-11 stsp 	local short_new_commit1=`trim_obj_id 28 $new_commit1`
  56 818c7501 2019-07-11 stsp 	local short_new_commit2=`trim_obj_id 28 $new_commit2`
  57 818c7501 2019-07-11 stsp 
  58 818c7501 2019-07-11 stsp 	echo "G  gamma/delta" >> $testroot/stdout.expected
  59 818c7501 2019-07-11 stsp 	echo -n "$short_orig_commit1 -> $short_new_commit1" \
  60 818c7501 2019-07-11 stsp 		>> $testroot/stdout.expected
  61 818c7501 2019-07-11 stsp 	echo ": committing to delta on newbranch" >> $testroot/stdout.expected
  62 818c7501 2019-07-11 stsp 	echo "G  alpha" >> $testroot/stdout.expected
  63 818c7501 2019-07-11 stsp 	echo "D  beta" >> $testroot/stdout.expected
  64 818c7501 2019-07-11 stsp 	echo "A  epsilon/new" >> $testroot/stdout.expected
  65 818c7501 2019-07-11 stsp 	echo -n "$short_orig_commit2 -> $short_new_commit2" \
  66 818c7501 2019-07-11 stsp 		>> $testroot/stdout.expected
  67 818c7501 2019-07-11 stsp 	echo ": committing more changes on newbranch" \
  68 818c7501 2019-07-11 stsp 		>> $testroot/stdout.expected
  69 818c7501 2019-07-11 stsp 	echo "Switching work tree to refs/heads/newbranch" \
  70 818c7501 2019-07-11 stsp 		>> $testroot/stdout.expected
  71 818c7501 2019-07-11 stsp 
  72 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
  73 818c7501 2019-07-11 stsp 	ret="$?"
  74 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
  75 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
  76 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
  77 818c7501 2019-07-11 stsp 		return 1
  78 818c7501 2019-07-11 stsp 	fi
  79 818c7501 2019-07-11 stsp 
  80 818c7501 2019-07-11 stsp 	echo "modified delta on branch" > $testroot/content.expected
  81 818c7501 2019-07-11 stsp 	cat $testroot/wt/gamma/delta > $testroot/content
  82 818c7501 2019-07-11 stsp 	cmp -s $testroot/content.expected $testroot/content
  83 818c7501 2019-07-11 stsp 	ret="$?"
  84 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
  85 818c7501 2019-07-11 stsp 		diff -u $testroot/content.expected $testroot/content
  86 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
  87 818c7501 2019-07-11 stsp 		return 1
  88 818c7501 2019-07-11 stsp 	fi
  89 818c7501 2019-07-11 stsp 
  90 818c7501 2019-07-11 stsp 	echo "modified alpha on branch" > $testroot/content.expected
  91 818c7501 2019-07-11 stsp 	cat $testroot/wt/alpha > $testroot/content
  92 818c7501 2019-07-11 stsp 	cmp -s $testroot/content.expected $testroot/content
  93 818c7501 2019-07-11 stsp 	ret="$?"
  94 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
  95 818c7501 2019-07-11 stsp 		diff -u $testroot/content.expected $testroot/content
  96 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
  97 818c7501 2019-07-11 stsp 		return 1
  98 818c7501 2019-07-11 stsp 	fi
  99 818c7501 2019-07-11 stsp 
 100 818c7501 2019-07-11 stsp 	if [ -e $testroot/wt/beta ]; then
 101 818c7501 2019-07-11 stsp 		echo "removed file beta still exists on disk" >&2
 102 818c7501 2019-07-11 stsp 		test_done "$testroot" "1"
 103 818c7501 2019-07-11 stsp 		return 1
 104 818c7501 2019-07-11 stsp 	fi
 105 818c7501 2019-07-11 stsp 
 106 818c7501 2019-07-11 stsp 	echo "new file on branch" > $testroot/content.expected
 107 818c7501 2019-07-11 stsp 	cat $testroot/wt/epsilon/new > $testroot/content
 108 818c7501 2019-07-11 stsp 	cmp -s $testroot/content.expected $testroot/content
 109 818c7501 2019-07-11 stsp 	ret="$?"
 110 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 111 818c7501 2019-07-11 stsp 		diff -u $testroot/content.expected $testroot/content
 112 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 113 818c7501 2019-07-11 stsp 		return 1
 114 818c7501 2019-07-11 stsp 	fi
 115 818c7501 2019-07-11 stsp 
 116 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got status > $testroot/stdout)
 117 818c7501 2019-07-11 stsp 
 118 818c7501 2019-07-11 stsp 	echo -n > $testroot/stdout.expected
 119 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 120 818c7501 2019-07-11 stsp 	ret="$?"
 121 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 122 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 123 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 124 818c7501 2019-07-11 stsp 		return 1
 125 818c7501 2019-07-11 stsp 	fi
 126 818c7501 2019-07-11 stsp 
 127 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
 128 818c7501 2019-07-11 stsp 	echo "commit $new_commit2 (newbranch)" > $testroot/stdout.expected
 129 818c7501 2019-07-11 stsp 	echo "commit $new_commit1" >> $testroot/stdout.expected
 130 818c7501 2019-07-11 stsp 	echo "commit $master_commit (master)" >> $testroot/stdout.expected
 131 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 132 818c7501 2019-07-11 stsp 	ret="$?"
 133 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 134 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 135 818c7501 2019-07-11 stsp 	fi
 136 818c7501 2019-07-11 stsp 	test_done "$testroot" "$ret"
 137 818c7501 2019-07-11 stsp }
 138 818c7501 2019-07-11 stsp 
 139 818c7501 2019-07-11 stsp function test_rebase_ancestry_check {
 140 818c7501 2019-07-11 stsp 	local testroot=`test_init rebase_ancestry_check`
 141 818c7501 2019-07-11 stsp 
 142 818c7501 2019-07-11 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 143 818c7501 2019-07-11 stsp 	ret="$?"
 144 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 145 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 146 818c7501 2019-07-11 stsp 		return 1
 147 818c7501 2019-07-11 stsp 	fi
 148 818c7501 2019-07-11 stsp 
 149 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
 150 818c7501 2019-07-11 stsp 	echo "modified delta on branch" > $testroot/repo/gamma/delta
 151 818c7501 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to delta on newbranch"
 152 818c7501 2019-07-11 stsp 
 153 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got rebase newbranch > $testroot/stdout \
 154 818c7501 2019-07-11 stsp 		2> $testroot/stderr)
 155 818c7501 2019-07-11 stsp 
 156 818c7501 2019-07-11 stsp 	echo -n > $testroot/stdout.expected
 157 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 158 818c7501 2019-07-11 stsp 	ret="$?"
 159 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 160 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 161 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 162 818c7501 2019-07-11 stsp 		return 1
 163 818c7501 2019-07-11 stsp 	fi
 164 818c7501 2019-07-11 stsp 
 165 818c7501 2019-07-11 stsp 	echo -n "got: specified branch resolves to a commit " \
 166 818c7501 2019-07-11 stsp 		> $testroot/stderr.expected
 167 818c7501 2019-07-11 stsp 	echo "which is already contained in work tree's branch" \
 168 818c7501 2019-07-11 stsp 		>> $testroot/stderr.expected
 169 818c7501 2019-07-11 stsp 	cmp -s $testroot/stderr.expected $testroot/stderr
 170 818c7501 2019-07-11 stsp 	ret="$?"
 171 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 172 818c7501 2019-07-11 stsp 		diff -u $testroot/stderr.expected $testroot/stderr
 173 818c7501 2019-07-11 stsp 	fi
 174 818c7501 2019-07-11 stsp 	test_done "$testroot" "$ret"
 175 818c7501 2019-07-11 stsp }
 176 818c7501 2019-07-11 stsp 
 177 818c7501 2019-07-11 stsp function test_rebase_continue {
 178 818c7501 2019-07-11 stsp 	local testroot=`test_init rebase_continue`
 179 f69721c3 2019-10-21 stsp 	local init_commit=`git_show_head $testroot/repo`
 180 818c7501 2019-07-11 stsp 
 181 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
 182 818c7501 2019-07-11 stsp 	echo "modified alpha on branch" > $testroot/repo/alpha
 183 818c7501 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to alpha on newbranch"
 184 818c7501 2019-07-11 stsp 	local orig_commit1=`git_show_head $testroot/repo`
 185 a0ea4fc0 2020-02-28 stsp 	local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
 186 818c7501 2019-07-11 stsp 
 187 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q master)
 188 818c7501 2019-07-11 stsp 	echo "modified alpha on master" > $testroot/repo/alpha
 189 818c7501 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to alpha on master"
 190 818c7501 2019-07-11 stsp 	local master_commit=`git_show_head $testroot/repo`
 191 818c7501 2019-07-11 stsp 
 192 818c7501 2019-07-11 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 193 818c7501 2019-07-11 stsp 	ret="$?"
 194 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 195 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 196 818c7501 2019-07-11 stsp 		return 1
 197 818c7501 2019-07-11 stsp 	fi
 198 818c7501 2019-07-11 stsp 
 199 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got rebase newbranch > $testroot/stdout \
 200 818c7501 2019-07-11 stsp 		2> $testroot/stderr)
 201 818c7501 2019-07-11 stsp 
 202 818c7501 2019-07-11 stsp 	echo "C  alpha" > $testroot/stdout.expected
 203 9627c110 2020-04-18 stsp 	echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
 204 a0ea4fc0 2020-02-28 stsp 	echo -n "$short_orig_commit1 -> merge conflict" \
 205 a0ea4fc0 2020-02-28 stsp 		>> $testroot/stdout.expected
 206 a0ea4fc0 2020-02-28 stsp 	echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
 207 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 208 818c7501 2019-07-11 stsp 	ret="$?"
 209 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 210 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 211 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 212 818c7501 2019-07-11 stsp 		return 1
 213 818c7501 2019-07-11 stsp 	fi
 214 818c7501 2019-07-11 stsp 
 215 11495e04 2019-07-12 stsp 	echo "got: conflicts must be resolved before rebasing can continue" \
 216 818c7501 2019-07-11 stsp 		> $testroot/stderr.expected
 217 818c7501 2019-07-11 stsp 	cmp -s $testroot/stderr.expected $testroot/stderr
 218 818c7501 2019-07-11 stsp 	ret="$?"
 219 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 220 818c7501 2019-07-11 stsp 		diff -u $testroot/stderr.expected $testroot/stderr
 221 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 222 818c7501 2019-07-11 stsp 		return 1
 223 818c7501 2019-07-11 stsp 	fi
 224 818c7501 2019-07-11 stsp 
 225 f69721c3 2019-10-21 stsp 	echo "<<<<<<< merged change: commit $orig_commit1" \
 226 f69721c3 2019-10-21 stsp 		> $testroot/content.expected
 227 818c7501 2019-07-11 stsp 	echo "modified alpha on branch" >> $testroot/content.expected
 228 f69721c3 2019-10-21 stsp 	echo "||||||| 3-way merge base: commit $init_commit" \
 229 f69721c3 2019-10-21 stsp 		>> $testroot/content.expected
 230 d136cfcb 2019-10-12 stsp 	echo "alpha" >> $testroot/content.expected
 231 818c7501 2019-07-11 stsp 	echo "=======" >> $testroot/content.expected
 232 818c7501 2019-07-11 stsp 	echo "modified alpha on master" >> $testroot/content.expected
 233 f69721c3 2019-10-21 stsp 	echo '>>>>>>>' >> $testroot/content.expected
 234 818c7501 2019-07-11 stsp 	cat $testroot/wt/alpha > $testroot/content
 235 818c7501 2019-07-11 stsp 	cmp -s $testroot/content.expected $testroot/content
 236 818c7501 2019-07-11 stsp 	ret="$?"
 237 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 238 818c7501 2019-07-11 stsp 		diff -u $testroot/content.expected $testroot/content
 239 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 240 818c7501 2019-07-11 stsp 		return 1
 241 818c7501 2019-07-11 stsp 	fi
 242 818c7501 2019-07-11 stsp 
 243 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got status > $testroot/stdout)
 244 818c7501 2019-07-11 stsp 
 245 818c7501 2019-07-11 stsp 	echo "C  alpha" > $testroot/stdout.expected
 246 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 247 818c7501 2019-07-11 stsp 	ret="$?"
 248 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 249 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 250 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 251 818c7501 2019-07-11 stsp 		return 1
 252 818c7501 2019-07-11 stsp 	fi
 253 818c7501 2019-07-11 stsp 
 254 818c7501 2019-07-11 stsp 	# resolve the conflict
 255 818c7501 2019-07-11 stsp 	echo "modified alpha on branch and master" > $testroot/wt/alpha
 256 818c7501 2019-07-11 stsp 
 257 f032f1f7 2019-08-04 stsp 	# test interaction of 'got stage' and rebase -c
 258 f032f1f7 2019-08-04 stsp 	(cd $testroot/wt && got stage alpha > /dev/null)
 259 f032f1f7 2019-08-04 stsp 	(cd $testroot/wt && got rebase -c > $testroot/stdout \
 260 f032f1f7 2019-08-04 stsp 		2> $testroot/stderr)
 261 f032f1f7 2019-08-04 stsp 	ret="$?"
 262 f032f1f7 2019-08-04 stsp 	if [ "$ret" == "0" ]; then
 263 f032f1f7 2019-08-04 stsp 		echo "rebase succeeded unexpectedly" >&2
 264 f032f1f7 2019-08-04 stsp 		test_done "$testroot" "1"
 265 f032f1f7 2019-08-04 stsp 		return 1
 266 f032f1f7 2019-08-04 stsp 	fi
 267 f032f1f7 2019-08-04 stsp 	echo -n "got: work tree contains files with staged changes; " \
 268 f032f1f7 2019-08-04 stsp 		> $testroot/stderr.expected
 269 f032f1f7 2019-08-04 stsp 	echo "these changes must be committed or unstaged first" \
 270 f032f1f7 2019-08-04 stsp 		>> $testroot/stderr.expected
 271 f032f1f7 2019-08-04 stsp 	cmp -s $testroot/stderr.expected $testroot/stderr
 272 f032f1f7 2019-08-04 stsp 	ret="$?"
 273 f032f1f7 2019-08-04 stsp 	if [ "$ret" != "0" ]; then
 274 f032f1f7 2019-08-04 stsp 		diff -u $testroot/stderr.expected $testroot/stderr
 275 f032f1f7 2019-08-04 stsp 		test_done "$testroot" "$ret"
 276 f032f1f7 2019-08-04 stsp 		return 1
 277 f032f1f7 2019-08-04 stsp 	fi
 278 f032f1f7 2019-08-04 stsp 
 279 f032f1f7 2019-08-04 stsp 	(cd $testroot/wt && got unstage alpha > /dev/null)
 280 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got rebase -c > $testroot/stdout)
 281 818c7501 2019-07-11 stsp 
 282 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q newbranch)
 283 818c7501 2019-07-11 stsp 	local new_commit1=`git_show_head $testroot/repo`
 284 818c7501 2019-07-11 stsp 	local short_new_commit1=`trim_obj_id 28 $new_commit1`
 285 818c7501 2019-07-11 stsp 
 286 818c7501 2019-07-11 stsp 	echo -n "$short_orig_commit1 -> $short_new_commit1" \
 287 818c7501 2019-07-11 stsp 		> $testroot/stdout.expected
 288 818c7501 2019-07-11 stsp 	echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
 289 818c7501 2019-07-11 stsp 	echo "Switching work tree to refs/heads/newbranch" \
 290 818c7501 2019-07-11 stsp 		>> $testroot/stdout.expected
 291 818c7501 2019-07-11 stsp 
 292 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 293 818c7501 2019-07-11 stsp 	ret="$?"
 294 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 295 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 296 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 297 818c7501 2019-07-11 stsp 		return 1
 298 818c7501 2019-07-11 stsp 	fi
 299 818c7501 2019-07-11 stsp 
 300 818c7501 2019-07-11 stsp 
 301 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got log -l2 | grep ^commit > $testroot/stdout)
 302 818c7501 2019-07-11 stsp 	echo "commit $new_commit1 (newbranch)" > $testroot/stdout.expected
 303 818c7501 2019-07-11 stsp 	echo "commit $master_commit (master)" >> $testroot/stdout.expected
 304 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 305 818c7501 2019-07-11 stsp 	ret="$?"
 306 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 307 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 308 818c7501 2019-07-11 stsp 	fi
 309 818c7501 2019-07-11 stsp 	test_done "$testroot" "$ret"
 310 818c7501 2019-07-11 stsp }
 311 818c7501 2019-07-11 stsp 
 312 818c7501 2019-07-11 stsp function test_rebase_abort {
 313 818c7501 2019-07-11 stsp 	local testroot=`test_init rebase_abort`
 314 818c7501 2019-07-11 stsp 
 315 818c7501 2019-07-11 stsp 	local init_commit=`git_show_head $testroot/repo`
 316 818c7501 2019-07-11 stsp 
 317 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
 318 818c7501 2019-07-11 stsp 	echo "modified alpha on branch" > $testroot/repo/alpha
 319 818c7501 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to alpha on newbranch"
 320 818c7501 2019-07-11 stsp 	local orig_commit1=`git_show_head $testroot/repo`
 321 a0ea4fc0 2020-02-28 stsp 	local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
 322 818c7501 2019-07-11 stsp 
 323 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q master)
 324 818c7501 2019-07-11 stsp 	echo "modified alpha on master" > $testroot/repo/alpha
 325 818c7501 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to alpha on master"
 326 818c7501 2019-07-11 stsp 	local master_commit=`git_show_head $testroot/repo`
 327 818c7501 2019-07-11 stsp 
 328 818c7501 2019-07-11 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 329 818c7501 2019-07-11 stsp 	ret="$?"
 330 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 331 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 332 818c7501 2019-07-11 stsp 		return 1
 333 818c7501 2019-07-11 stsp 	fi
 334 818c7501 2019-07-11 stsp 
 335 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got rebase newbranch > $testroot/stdout \
 336 818c7501 2019-07-11 stsp 		2> $testroot/stderr)
 337 818c7501 2019-07-11 stsp 
 338 818c7501 2019-07-11 stsp 	echo "C  alpha" > $testroot/stdout.expected
 339 9627c110 2020-04-18 stsp 	echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
 340 a0ea4fc0 2020-02-28 stsp 	echo -n "$short_orig_commit1 -> merge conflict" \
 341 a0ea4fc0 2020-02-28 stsp 		>> $testroot/stdout.expected
 342 a0ea4fc0 2020-02-28 stsp 	echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
 343 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 344 818c7501 2019-07-11 stsp 	ret="$?"
 345 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 346 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 347 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 348 818c7501 2019-07-11 stsp 		return 1
 349 818c7501 2019-07-11 stsp 	fi
 350 818c7501 2019-07-11 stsp 
 351 11495e04 2019-07-12 stsp 	echo "got: conflicts must be resolved before rebasing can continue" \
 352 818c7501 2019-07-11 stsp 		> $testroot/stderr.expected
 353 818c7501 2019-07-11 stsp 	cmp -s $testroot/stderr.expected $testroot/stderr
 354 818c7501 2019-07-11 stsp 	ret="$?"
 355 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 356 818c7501 2019-07-11 stsp 		diff -u $testroot/stderr.expected $testroot/stderr
 357 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 358 818c7501 2019-07-11 stsp 		return 1
 359 818c7501 2019-07-11 stsp 	fi
 360 818c7501 2019-07-11 stsp 
 361 f69721c3 2019-10-21 stsp 	echo "<<<<<<< merged change: commit $orig_commit1" \
 362 f69721c3 2019-10-21 stsp 		> $testroot/content.expected
 363 818c7501 2019-07-11 stsp 	echo "modified alpha on branch" >> $testroot/content.expected
 364 f69721c3 2019-10-21 stsp 	echo "||||||| 3-way merge base: commit $init_commit" \
 365 f69721c3 2019-10-21 stsp 		>> $testroot/content.expected
 366 d136cfcb 2019-10-12 stsp 	echo "alpha" >> $testroot/content.expected
 367 818c7501 2019-07-11 stsp 	echo "=======" >> $testroot/content.expected
 368 818c7501 2019-07-11 stsp 	echo "modified alpha on master" >> $testroot/content.expected
 369 f69721c3 2019-10-21 stsp 	echo '>>>>>>>' >> $testroot/content.expected
 370 818c7501 2019-07-11 stsp 	cat $testroot/wt/alpha > $testroot/content
 371 818c7501 2019-07-11 stsp 	cmp -s $testroot/content.expected $testroot/content
 372 818c7501 2019-07-11 stsp 	ret="$?"
 373 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 374 818c7501 2019-07-11 stsp 		diff -u $testroot/content.expected $testroot/content
 375 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 376 818c7501 2019-07-11 stsp 		return 1
 377 818c7501 2019-07-11 stsp 	fi
 378 818c7501 2019-07-11 stsp 
 379 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got status > $testroot/stdout)
 380 818c7501 2019-07-11 stsp 
 381 818c7501 2019-07-11 stsp 	echo "C  alpha" > $testroot/stdout.expected
 382 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 383 818c7501 2019-07-11 stsp 	ret="$?"
 384 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 385 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 386 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 387 818c7501 2019-07-11 stsp 		return 1
 388 818c7501 2019-07-11 stsp 	fi
 389 818c7501 2019-07-11 stsp 
 390 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got rebase -a > $testroot/stdout)
 391 818c7501 2019-07-11 stsp 
 392 818c7501 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q newbranch)
 393 818c7501 2019-07-11 stsp 
 394 818c7501 2019-07-11 stsp 	echo "Switching work tree to refs/heads/master" \
 395 818c7501 2019-07-11 stsp 		> $testroot/stdout.expected
 396 818c7501 2019-07-11 stsp 	echo 'R  alpha' >> $testroot/stdout.expected
 397 818c7501 2019-07-11 stsp 	echo "Rebase of refs/heads/newbranch aborted" \
 398 818c7501 2019-07-11 stsp 		>> $testroot/stdout.expected
 399 818c7501 2019-07-11 stsp 
 400 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 401 818c7501 2019-07-11 stsp 	ret="$?"
 402 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 403 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 404 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 405 818c7501 2019-07-11 stsp 		return 1
 406 818c7501 2019-07-11 stsp 	fi
 407 818c7501 2019-07-11 stsp 
 408 818c7501 2019-07-11 stsp 	echo "modified alpha on master" > $testroot/content.expected
 409 818c7501 2019-07-11 stsp 	cat $testroot/wt/alpha > $testroot/content
 410 818c7501 2019-07-11 stsp 	cmp -s $testroot/content.expected $testroot/content
 411 818c7501 2019-07-11 stsp 	ret="$?"
 412 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 413 818c7501 2019-07-11 stsp 		diff -u $testroot/content.expected $testroot/content
 414 818c7501 2019-07-11 stsp 		test_done "$testroot" "$ret"
 415 818c7501 2019-07-11 stsp 		return 1
 416 818c7501 2019-07-11 stsp 	fi
 417 818c7501 2019-07-11 stsp 
 418 818c7501 2019-07-11 stsp 	(cd $testroot/wt && got log -l3 -c newbranch \
 419 818c7501 2019-07-11 stsp 		| grep ^commit > $testroot/stdout)
 420 818c7501 2019-07-11 stsp 	echo "commit $orig_commit1 (newbranch)" > $testroot/stdout.expected
 421 818c7501 2019-07-11 stsp 	echo "commit $init_commit" >> $testroot/stdout.expected
 422 818c7501 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 423 818c7501 2019-07-11 stsp 	ret="$?"
 424 818c7501 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 425 818c7501 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 426 818c7501 2019-07-11 stsp 	fi
 427 818c7501 2019-07-11 stsp 	test_done "$testroot" "$ret"
 428 818c7501 2019-07-11 stsp }
 429 818c7501 2019-07-11 stsp 
 430 ff0d2220 2019-07-11 stsp function test_rebase_no_op_change {
 431 ff0d2220 2019-07-11 stsp 	local testroot=`test_init rebase_no_op_change`
 432 ff0d2220 2019-07-11 stsp 	local init_commit=`git_show_head $testroot/repo`
 433 ff0d2220 2019-07-11 stsp 
 434 ff0d2220 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
 435 ff0d2220 2019-07-11 stsp 	echo "modified alpha on branch" > $testroot/repo/alpha
 436 ff0d2220 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to alpha on newbranch"
 437 ff0d2220 2019-07-11 stsp 	local orig_commit1=`git_show_head $testroot/repo`
 438 a0ea4fc0 2020-02-28 stsp 	local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
 439 ff0d2220 2019-07-11 stsp 
 440 ff0d2220 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q master)
 441 ff0d2220 2019-07-11 stsp 	echo "modified alpha on master" > $testroot/repo/alpha
 442 ff0d2220 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to alpha on master"
 443 ff0d2220 2019-07-11 stsp 	local master_commit=`git_show_head $testroot/repo`
 444 ff0d2220 2019-07-11 stsp 
 445 ff0d2220 2019-07-11 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 446 ff0d2220 2019-07-11 stsp 	ret="$?"
 447 ff0d2220 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 448 ff0d2220 2019-07-11 stsp 		test_done "$testroot" "$ret"
 449 ff0d2220 2019-07-11 stsp 		return 1
 450 ff0d2220 2019-07-11 stsp 	fi
 451 ff0d2220 2019-07-11 stsp 
 452 ff0d2220 2019-07-11 stsp 	(cd $testroot/wt && got rebase newbranch > $testroot/stdout \
 453 ff0d2220 2019-07-11 stsp 		2> $testroot/stderr)
 454 ff0d2220 2019-07-11 stsp 
 455 ff0d2220 2019-07-11 stsp 	echo "C  alpha" > $testroot/stdout.expected
 456 9627c110 2020-04-18 stsp 	echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
 457 a0ea4fc0 2020-02-28 stsp 	echo -n "$short_orig_commit1 -> merge conflict" \
 458 a0ea4fc0 2020-02-28 stsp 		>> $testroot/stdout.expected
 459 a0ea4fc0 2020-02-28 stsp 	echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
 460 ff0d2220 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 461 ff0d2220 2019-07-11 stsp 	ret="$?"
 462 ff0d2220 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 463 ff0d2220 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 464 ff0d2220 2019-07-11 stsp 		test_done "$testroot" "$ret"
 465 ff0d2220 2019-07-11 stsp 		return 1
 466 ff0d2220 2019-07-11 stsp 	fi
 467 ff0d2220 2019-07-11 stsp 
 468 11495e04 2019-07-12 stsp 	echo "got: conflicts must be resolved before rebasing can continue" \
 469 ff0d2220 2019-07-11 stsp 		> $testroot/stderr.expected
 470 ff0d2220 2019-07-11 stsp 	cmp -s $testroot/stderr.expected $testroot/stderr
 471 ff0d2220 2019-07-11 stsp 	ret="$?"
 472 ff0d2220 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 473 ff0d2220 2019-07-11 stsp 		diff -u $testroot/stderr.expected $testroot/stderr
 474 ff0d2220 2019-07-11 stsp 		test_done "$testroot" "$ret"
 475 ff0d2220 2019-07-11 stsp 		return 1
 476 ff0d2220 2019-07-11 stsp 	fi
 477 ff0d2220 2019-07-11 stsp 
 478 f69721c3 2019-10-21 stsp 	echo "<<<<<<< merged change: commit $orig_commit1" \
 479 f69721c3 2019-10-21 stsp 		> $testroot/content.expected
 480 ff0d2220 2019-07-11 stsp 	echo "modified alpha on branch" >> $testroot/content.expected
 481 f69721c3 2019-10-21 stsp 	echo "||||||| 3-way merge base: commit $init_commit" \
 482 f69721c3 2019-10-21 stsp 		>> $testroot/content.expected
 483 d136cfcb 2019-10-12 stsp 	echo "alpha" >> $testroot/content.expected
 484 ff0d2220 2019-07-11 stsp 	echo "=======" >> $testroot/content.expected
 485 ff0d2220 2019-07-11 stsp 	echo "modified alpha on master" >> $testroot/content.expected
 486 f69721c3 2019-10-21 stsp 	echo '>>>>>>>' >> $testroot/content.expected
 487 ff0d2220 2019-07-11 stsp 	cat $testroot/wt/alpha > $testroot/content
 488 ff0d2220 2019-07-11 stsp 	cmp -s $testroot/content.expected $testroot/content
 489 ff0d2220 2019-07-11 stsp 	ret="$?"
 490 ff0d2220 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 491 ff0d2220 2019-07-11 stsp 		diff -u $testroot/content.expected $testroot/content
 492 ff0d2220 2019-07-11 stsp 		test_done "$testroot" "$ret"
 493 ff0d2220 2019-07-11 stsp 		return 1
 494 ff0d2220 2019-07-11 stsp 	fi
 495 ff0d2220 2019-07-11 stsp 
 496 ff0d2220 2019-07-11 stsp 	(cd $testroot/wt && got status > $testroot/stdout)
 497 ff0d2220 2019-07-11 stsp 
 498 ff0d2220 2019-07-11 stsp 	echo "C  alpha" > $testroot/stdout.expected
 499 ff0d2220 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 500 ff0d2220 2019-07-11 stsp 	ret="$?"
 501 ff0d2220 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 502 ff0d2220 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 503 ff0d2220 2019-07-11 stsp 		test_done "$testroot" "$ret"
 504 ff0d2220 2019-07-11 stsp 		return 1
 505 ff0d2220 2019-07-11 stsp 	fi
 506 ff0d2220 2019-07-11 stsp 
 507 ff0d2220 2019-07-11 stsp 	# resolve the conflict
 508 ff0d2220 2019-07-11 stsp 	echo "modified alpha on master" > $testroot/wt/alpha
 509 ff0d2220 2019-07-11 stsp 
 510 ff0d2220 2019-07-11 stsp 	(cd $testroot/wt && got rebase -c > $testroot/stdout)
 511 ff0d2220 2019-07-11 stsp 
 512 ff0d2220 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q newbranch)
 513 ff0d2220 2019-07-11 stsp 	local new_commit1=`git_show_head $testroot/repo`
 514 ff0d2220 2019-07-11 stsp 
 515 ff0d2220 2019-07-11 stsp 	echo -n "$short_orig_commit1 -> no-op change" \
 516 ff0d2220 2019-07-11 stsp 		> $testroot/stdout.expected
 517 ff0d2220 2019-07-11 stsp 	echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
 518 ff0d2220 2019-07-11 stsp 	echo "Switching work tree to refs/heads/newbranch" \
 519 ff0d2220 2019-07-11 stsp 		>> $testroot/stdout.expected
 520 ff0d2220 2019-07-11 stsp 
 521 ff0d2220 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 522 ff0d2220 2019-07-11 stsp 	ret="$?"
 523 ff0d2220 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 524 ff0d2220 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 525 ff0d2220 2019-07-11 stsp 		test_done "$testroot" "$ret"
 526 ff0d2220 2019-07-11 stsp 		return 1
 527 ff0d2220 2019-07-11 stsp 	fi
 528 ff0d2220 2019-07-11 stsp 
 529 ff0d2220 2019-07-11 stsp 
 530 ff0d2220 2019-07-11 stsp 	(cd $testroot/wt && got log -l2 | grep ^commit > $testroot/stdout)
 531 ff0d2220 2019-07-11 stsp 	echo "commit $master_commit (master, newbranch)" \
 532 ff0d2220 2019-07-11 stsp 		> $testroot/stdout.expected
 533 ff0d2220 2019-07-11 stsp 	echo "commit $init_commit" >> $testroot/stdout.expected
 534 7d5807f4 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 535 7d5807f4 2019-07-11 stsp 	ret="$?"
 536 7d5807f4 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 537 7d5807f4 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 538 7d5807f4 2019-07-11 stsp 	fi
 539 7d5807f4 2019-07-11 stsp 	test_done "$testroot" "$ret"
 540 7d5807f4 2019-07-11 stsp }
 541 7d5807f4 2019-07-11 stsp 
 542 7d5807f4 2019-07-11 stsp function test_rebase_in_progress {
 543 4ba9c4f6 2019-07-11 stsp 	local testroot=`test_init rebase_in_progress`
 544 7d5807f4 2019-07-11 stsp 	local init_commit=`git_show_head $testroot/repo`
 545 7d5807f4 2019-07-11 stsp 
 546 7d5807f4 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
 547 7d5807f4 2019-07-11 stsp 	echo "modified alpha on branch" > $testroot/repo/alpha
 548 7d5807f4 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to alpha on newbranch"
 549 7d5807f4 2019-07-11 stsp 	local orig_commit1=`git_show_head $testroot/repo`
 550 a0ea4fc0 2020-02-28 stsp 	local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
 551 7d5807f4 2019-07-11 stsp 
 552 7d5807f4 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q master)
 553 7d5807f4 2019-07-11 stsp 	echo "modified alpha on master" > $testroot/repo/alpha
 554 7d5807f4 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to alpha on master"
 555 7d5807f4 2019-07-11 stsp 	local master_commit=`git_show_head $testroot/repo`
 556 7d5807f4 2019-07-11 stsp 
 557 7d5807f4 2019-07-11 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 558 7d5807f4 2019-07-11 stsp 	ret="$?"
 559 7d5807f4 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 560 7d5807f4 2019-07-11 stsp 		test_done "$testroot" "$ret"
 561 7d5807f4 2019-07-11 stsp 		return 1
 562 7d5807f4 2019-07-11 stsp 	fi
 563 7d5807f4 2019-07-11 stsp 
 564 7d5807f4 2019-07-11 stsp 	(cd $testroot/wt && got rebase newbranch > $testroot/stdout \
 565 7d5807f4 2019-07-11 stsp 		2> $testroot/stderr)
 566 7d5807f4 2019-07-11 stsp 
 567 7d5807f4 2019-07-11 stsp 	echo "C  alpha" > $testroot/stdout.expected
 568 9627c110 2020-04-18 stsp 	echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
 569 a0ea4fc0 2020-02-28 stsp 	echo -n "$short_orig_commit1 -> merge conflict" \
 570 a0ea4fc0 2020-02-28 stsp 		>> $testroot/stdout.expected
 571 a0ea4fc0 2020-02-28 stsp 	echo ": committing to alpha on newbranch" >> $testroot/stdout.expected
 572 7d5807f4 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 573 7d5807f4 2019-07-11 stsp 	ret="$?"
 574 7d5807f4 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 575 7d5807f4 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 576 7d5807f4 2019-07-11 stsp 		test_done "$testroot" "$ret"
 577 7d5807f4 2019-07-11 stsp 		return 1
 578 7d5807f4 2019-07-11 stsp 	fi
 579 7d5807f4 2019-07-11 stsp 
 580 11495e04 2019-07-12 stsp 	echo "got: conflicts must be resolved before rebasing can continue" \
 581 7d5807f4 2019-07-11 stsp 		> $testroot/stderr.expected
 582 7d5807f4 2019-07-11 stsp 	cmp -s $testroot/stderr.expected $testroot/stderr
 583 7d5807f4 2019-07-11 stsp 	ret="$?"
 584 7d5807f4 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 585 7d5807f4 2019-07-11 stsp 		diff -u $testroot/stderr.expected $testroot/stderr
 586 7d5807f4 2019-07-11 stsp 		test_done "$testroot" "$ret"
 587 7d5807f4 2019-07-11 stsp 		return 1
 588 7d5807f4 2019-07-11 stsp 	fi
 589 7d5807f4 2019-07-11 stsp 
 590 f69721c3 2019-10-21 stsp 	echo "<<<<<<< merged change: commit $orig_commit1" \
 591 f69721c3 2019-10-21 stsp 		> $testroot/content.expected
 592 7d5807f4 2019-07-11 stsp 	echo "modified alpha on branch" >> $testroot/content.expected
 593 f69721c3 2019-10-21 stsp 	echo "||||||| 3-way merge base: commit $init_commit" \
 594 f69721c3 2019-10-21 stsp 		>> $testroot/content.expected
 595 d136cfcb 2019-10-12 stsp 	echo "alpha" >> $testroot/content.expected
 596 7d5807f4 2019-07-11 stsp 	echo "=======" >> $testroot/content.expected
 597 7d5807f4 2019-07-11 stsp 	echo "modified alpha on master" >> $testroot/content.expected
 598 f69721c3 2019-10-21 stsp 	echo '>>>>>>>' >> $testroot/content.expected
 599 7d5807f4 2019-07-11 stsp 	cat $testroot/wt/alpha > $testroot/content
 600 7d5807f4 2019-07-11 stsp 	cmp -s $testroot/content.expected $testroot/content
 601 7d5807f4 2019-07-11 stsp 	ret="$?"
 602 7d5807f4 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 603 7d5807f4 2019-07-11 stsp 		diff -u $testroot/content.expected $testroot/content
 604 7d5807f4 2019-07-11 stsp 		test_done "$testroot" "$ret"
 605 7d5807f4 2019-07-11 stsp 		return 1
 606 7d5807f4 2019-07-11 stsp 	fi
 607 7d5807f4 2019-07-11 stsp 
 608 7d5807f4 2019-07-11 stsp 	(cd $testroot/wt && got status > $testroot/stdout)
 609 7d5807f4 2019-07-11 stsp 
 610 7d5807f4 2019-07-11 stsp 	echo "C  alpha" > $testroot/stdout.expected
 611 ff0d2220 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 612 ff0d2220 2019-07-11 stsp 	ret="$?"
 613 ff0d2220 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 614 ff0d2220 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 615 7d5807f4 2019-07-11 stsp 		test_done "$testroot" "$ret"
 616 7d5807f4 2019-07-11 stsp 		return 1
 617 ff0d2220 2019-07-11 stsp 	fi
 618 7d5807f4 2019-07-11 stsp 
 619 7d5807f4 2019-07-11 stsp 	for cmd in update commit; do
 620 7d5807f4 2019-07-11 stsp 		(cd $testroot/wt && got $cmd > $testroot/stdout \
 621 7d5807f4 2019-07-11 stsp 			2> $testroot/stderr)
 622 7d5807f4 2019-07-11 stsp 
 623 7d5807f4 2019-07-11 stsp 		echo -n > $testroot/stdout.expected
 624 7d5807f4 2019-07-11 stsp 		cmp -s $testroot/stdout.expected $testroot/stdout
 625 7d5807f4 2019-07-11 stsp 		ret="$?"
 626 7d5807f4 2019-07-11 stsp 		if [ "$ret" != "0" ]; then
 627 7d5807f4 2019-07-11 stsp 			diff -u $testroot/stdout.expected $testroot/stdout
 628 7d5807f4 2019-07-11 stsp 			test_done "$testroot" "$ret"
 629 7d5807f4 2019-07-11 stsp 			return 1
 630 7d5807f4 2019-07-11 stsp 		fi
 631 7d5807f4 2019-07-11 stsp 
 632 7d5807f4 2019-07-11 stsp 		echo -n "got: a rebase operation is in progress in this " \
 633 7d5807f4 2019-07-11 stsp 			> $testroot/stderr.expected
 634 7d5807f4 2019-07-11 stsp 		echo "work tree and must be continued or aborted first" \
 635 7d5807f4 2019-07-11 stsp 			>> $testroot/stderr.expected
 636 7d5807f4 2019-07-11 stsp 		cmp -s $testroot/stderr.expected $testroot/stderr
 637 7d5807f4 2019-07-11 stsp 		ret="$?"
 638 7d5807f4 2019-07-11 stsp 		if [ "$ret" != "0" ]; then
 639 7d5807f4 2019-07-11 stsp 			diff -u $testroot/stderr.expected $testroot/stderr
 640 7d5807f4 2019-07-11 stsp 			test_done "$testroot" "$ret"
 641 7d5807f4 2019-07-11 stsp 			return 1
 642 7d5807f4 2019-07-11 stsp 		fi
 643 7d5807f4 2019-07-11 stsp 	done
 644 64c6d990 2019-07-11 stsp 
 645 64c6d990 2019-07-11 stsp 	test_done "$testroot" "$ret"
 646 64c6d990 2019-07-11 stsp }
 647 64c6d990 2019-07-11 stsp 
 648 64c6d990 2019-07-11 stsp function test_rebase_path_prefix {
 649 64c6d990 2019-07-11 stsp 	local testroot=`test_init rebase_path_prefix`
 650 64c6d990 2019-07-11 stsp 
 651 64c6d990 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
 652 64c6d990 2019-07-11 stsp 	echo "modified delta on branch" > $testroot/repo/gamma/delta
 653 64c6d990 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to delta on newbranch"
 654 64c6d990 2019-07-11 stsp 
 655 64c6d990 2019-07-11 stsp 	local orig_commit1=`git_show_parent_commit $testroot/repo`
 656 64c6d990 2019-07-11 stsp 	local orig_commit2=`git_show_head $testroot/repo`
 657 64c6d990 2019-07-11 stsp 
 658 64c6d990 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q master)
 659 64c6d990 2019-07-11 stsp 	echo "modified zeta on master" > $testroot/repo/epsilon/zeta
 660 64c6d990 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to zeta on master"
 661 64c6d990 2019-07-11 stsp 	local master_commit=`git_show_head $testroot/repo`
 662 64c6d990 2019-07-11 stsp 
 663 64c6d990 2019-07-11 stsp 	got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
 664 64c6d990 2019-07-11 stsp 	ret="$?"
 665 64c6d990 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 666 64c6d990 2019-07-11 stsp 		test_done "$testroot" "$ret"
 667 64c6d990 2019-07-11 stsp 		return 1
 668 64c6d990 2019-07-11 stsp 	fi
 669 7d5807f4 2019-07-11 stsp 
 670 64c6d990 2019-07-11 stsp 	(cd $testroot/wt && got rebase newbranch \
 671 64c6d990 2019-07-11 stsp 		> $testroot/stdout 2> $testroot/stderr)
 672 64c6d990 2019-07-11 stsp 
 673 64c6d990 2019-07-11 stsp 	echo -n > $testroot/stdout.expected
 674 64c6d990 2019-07-11 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 675 64c6d990 2019-07-11 stsp 	ret="$?"
 676 64c6d990 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 677 64c6d990 2019-07-11 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 678 64c6d990 2019-07-11 stsp 		test_done "$testroot" "$ret"
 679 64c6d990 2019-07-11 stsp 		return 1
 680 64c6d990 2019-07-11 stsp 	fi
 681 64c6d990 2019-07-11 stsp 
 682 64c6d990 2019-07-11 stsp 	echo -n "got: cannot rebase branch which contains changes outside " \
 683 64c6d990 2019-07-11 stsp 		> $testroot/stderr.expected
 684 64c6d990 2019-07-11 stsp 	echo "of this work tree's path prefix" >> $testroot/stderr.expected
 685 787c8eb6 2019-07-11 stsp 	cmp -s $testroot/stderr.expected $testroot/stderr
 686 787c8eb6 2019-07-11 stsp 	ret="$?"
 687 787c8eb6 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 688 787c8eb6 2019-07-11 stsp 		diff -u $testroot/stderr.expected $testroot/stderr
 689 787c8eb6 2019-07-11 stsp 	fi
 690 787c8eb6 2019-07-11 stsp 	test_done "$testroot" "$ret"
 691 787c8eb6 2019-07-11 stsp }
 692 787c8eb6 2019-07-11 stsp 
 693 787c8eb6 2019-07-11 stsp function test_rebase_preserves_logmsg {
 694 787c8eb6 2019-07-11 stsp 	local testroot=`test_init rebase_preserves_logmsg`
 695 787c8eb6 2019-07-11 stsp 
 696 787c8eb6 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
 697 787c8eb6 2019-07-11 stsp 	echo "modified delta on branch" > $testroot/repo/gamma/delta
 698 787c8eb6 2019-07-11 stsp 	git_commit $testroot/repo -m "modified delta on newbranch"
 699 787c8eb6 2019-07-11 stsp 
 700 787c8eb6 2019-07-11 stsp 	echo "modified alpha on branch" > $testroot/repo/alpha
 701 787c8eb6 2019-07-11 stsp 	git_commit $testroot/repo -m "modified alpha on newbranch"
 702 787c8eb6 2019-07-11 stsp 
 703 787c8eb6 2019-07-11 stsp 	(cd $testroot/repo && got log -c newbranch -l2 | grep -v ^date: \
 704 787c8eb6 2019-07-11 stsp 		> $testroot/log.expected)
 705 787c8eb6 2019-07-11 stsp 
 706 787c8eb6 2019-07-11 stsp 	local orig_commit1=`git_show_parent_commit $testroot/repo`
 707 787c8eb6 2019-07-11 stsp 	local orig_commit2=`git_show_head $testroot/repo`
 708 787c8eb6 2019-07-11 stsp 
 709 787c8eb6 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q master)
 710 787c8eb6 2019-07-11 stsp 	echo "modified zeta on master" > $testroot/repo/epsilon/zeta
 711 787c8eb6 2019-07-11 stsp 	git_commit $testroot/repo -m "committing to zeta on master"
 712 787c8eb6 2019-07-11 stsp 	local master_commit=`git_show_head $testroot/repo`
 713 787c8eb6 2019-07-11 stsp 
 714 787c8eb6 2019-07-11 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 715 787c8eb6 2019-07-11 stsp 	ret="$?"
 716 787c8eb6 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 717 787c8eb6 2019-07-11 stsp 		test_done "$testroot" "$ret"
 718 787c8eb6 2019-07-11 stsp 		return 1
 719 787c8eb6 2019-07-11 stsp 	fi
 720 787c8eb6 2019-07-11 stsp 
 721 787c8eb6 2019-07-11 stsp 	(cd $testroot/wt && got rebase newbranch > /dev/null \
 722 787c8eb6 2019-07-11 stsp 		2> $testroot/stderr)
 723 787c8eb6 2019-07-11 stsp 
 724 787c8eb6 2019-07-11 stsp 	(cd $testroot/repo && git checkout -q newbranch)
 725 787c8eb6 2019-07-11 stsp 	local new_commit1=`git_show_parent_commit $testroot/repo`
 726 787c8eb6 2019-07-11 stsp 	local new_commit2=`git_show_head $testroot/repo`
 727 787c8eb6 2019-07-11 stsp 
 728 787c8eb6 2019-07-11 stsp 	echo -n > $testroot/stderr.expected
 729 64c6d990 2019-07-11 stsp 	cmp -s $testroot/stderr.expected $testroot/stderr
 730 64c6d990 2019-07-11 stsp 	ret="$?"
 731 64c6d990 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 732 64c6d990 2019-07-11 stsp 		diff -u $testroot/stderr.expected $testroot/stderr
 733 787c8eb6 2019-07-11 stsp 		test_done "$testroot" "$ret"
 734 787c8eb6 2019-07-11 stsp 		return 1
 735 64c6d990 2019-07-11 stsp 	fi
 736 787c8eb6 2019-07-11 stsp 
 737 787c8eb6 2019-07-11 stsp 	(cd $testroot/wt && got log -c newbranch -l2 | grep -v ^date: \
 738 787c8eb6 2019-07-11 stsp 		> $testroot/log)
 739 787c8eb6 2019-07-11 stsp 	sed -i -e "s/$orig_commit1/$new_commit1/" $testroot/log.expected
 740 787c8eb6 2019-07-11 stsp 	sed -i -e "s/$orig_commit2/$new_commit2/" $testroot/log.expected
 741 787c8eb6 2019-07-11 stsp 	cmp -s $testroot/log.expected $testroot/log
 742 787c8eb6 2019-07-11 stsp 	ret="$?"
 743 787c8eb6 2019-07-11 stsp 	if [ "$ret" != "0" ]; then
 744 787c8eb6 2019-07-11 stsp 		diff -u $testroot/log.expected $testroot/log
 745 fc66b545 2019-08-12 stsp 	fi
 746 fc66b545 2019-08-12 stsp 
 747 fc66b545 2019-08-12 stsp 	test_done "$testroot" "$ret"
 748 fc66b545 2019-08-12 stsp }
 749 fc66b545 2019-08-12 stsp 
 750 fc66b545 2019-08-12 stsp function test_rebase_no_commits_to_rebase {
 751 fc66b545 2019-08-12 stsp 	local testroot=`test_init rebase_no_commits_to_rebase`
 752 fc66b545 2019-08-12 stsp 
 753 fc66b545 2019-08-12 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 754 fc66b545 2019-08-12 stsp 	ret="$?"
 755 fc66b545 2019-08-12 stsp 	if [ "$ret" != "0" ]; then
 756 fc66b545 2019-08-12 stsp 		test_done "$testroot" "$ret"
 757 fc66b545 2019-08-12 stsp 		return 1
 758 fc66b545 2019-08-12 stsp 	fi
 759 fc66b545 2019-08-12 stsp 
 760 da76fce2 2020-02-24 stsp 	(cd $testroot/wt && got branch -n newbranch)
 761 fc66b545 2019-08-12 stsp 
 762 fc66b545 2019-08-12 stsp 	echo "modified alpha on master" > $testroot/wt/alpha
 763 fc66b545 2019-08-12 stsp 	(cd $testroot/wt && got commit -m 'test rebase_no_commits_to_rebase' \
 764 fc66b545 2019-08-12 stsp 		> /dev/null)
 765 fc66b545 2019-08-12 stsp 	(cd $testroot/wt && got update > /dev/null)
 766 fc66b545 2019-08-12 stsp 
 767 fc66b545 2019-08-12 stsp 	(cd $testroot/wt && got rebase newbranch > $testroot/stdout \
 768 fc66b545 2019-08-12 stsp 		2> $testroot/stderr)
 769 fc66b545 2019-08-12 stsp 
 770 fc66b545 2019-08-12 stsp 	echo "got: no commits to rebase" > $testroot/stderr.expected
 771 fc66b545 2019-08-12 stsp 	cmp -s $testroot/stderr.expected $testroot/stderr
 772 fc66b545 2019-08-12 stsp 	ret="$?"
 773 fc66b545 2019-08-12 stsp 	if [ "$ret" != "0" ]; then
 774 fc66b545 2019-08-12 stsp 		diff -u $testroot/stderr.expected $testroot/stderr
 775 fc66b545 2019-08-12 stsp 		test_done "$testroot" "$ret"
 776 fc66b545 2019-08-12 stsp 		return 1
 777 787c8eb6 2019-07-11 stsp 	fi
 778 787c8eb6 2019-07-11 stsp 
 779 fc66b545 2019-08-12 stsp 	echo "Rebase of refs/heads/newbranch aborted" \
 780 fc66b545 2019-08-12 stsp 		> $testroot/stdout.expected
 781 fc66b545 2019-08-12 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 782 fc66b545 2019-08-12 stsp 	ret="$?"
 783 fc66b545 2019-08-12 stsp 	if [ "$ret" != "0" ]; then
 784 fc66b545 2019-08-12 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 785 fc66b545 2019-08-12 stsp 		test_done "$testroot" "$ret"
 786 fc66b545 2019-08-12 stsp 		return 1
 787 fc66b545 2019-08-12 stsp 	fi
 788 fc66b545 2019-08-12 stsp 
 789 fc66b545 2019-08-12 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
 790 fc66b545 2019-08-12 stsp 	echo "Already up-to-date" > $testroot/stdout.expected
 791 fc66b545 2019-08-12 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 792 fc66b545 2019-08-12 stsp 	ret="$?"
 793 fc66b545 2019-08-12 stsp 	if [ "$ret" != "0" ]; then
 794 fc66b545 2019-08-12 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 795 fc66b545 2019-08-12 stsp 	fi
 796 ff0d2220 2019-07-11 stsp 	test_done "$testroot" "$ret"
 797 ff0d2220 2019-07-11 stsp }
 798 38b0338b 2019-11-29 stsp 
 799 38b0338b 2019-11-29 stsp function test_rebase_forward {
 800 38b0338b 2019-11-29 stsp 	local testroot=`test_init rebase_forward`
 801 38b0338b 2019-11-29 stsp 	local commit0=`git_show_head $testroot/repo`
 802 38b0338b 2019-11-29 stsp 
 803 38b0338b 2019-11-29 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 804 38b0338b 2019-11-29 stsp 	ret="$?"
 805 38b0338b 2019-11-29 stsp 	if [ "$ret" != "0" ]; then
 806 38b0338b 2019-11-29 stsp 		test_done "$testroot" "$ret"
 807 38b0338b 2019-11-29 stsp 		return 1
 808 38b0338b 2019-11-29 stsp 	fi
 809 38b0338b 2019-11-29 stsp 
 810 38b0338b 2019-11-29 stsp 	echo "change alpha 1" > $testroot/wt/alpha
 811 38b0338b 2019-11-29 stsp 	(cd $testroot/wt && got commit -m 'test rebase_forward' \
 812 38b0338b 2019-11-29 stsp 		> /dev/null)
 813 38b0338b 2019-11-29 stsp 	local commit1=`git_show_head $testroot/repo`
 814 ff0d2220 2019-07-11 stsp 
 815 38b0338b 2019-11-29 stsp 	echo "change alpha 2" > $testroot/wt/alpha
 816 38b0338b 2019-11-29 stsp 	(cd $testroot/wt && got commit -m 'test rebase_forward' \
 817 38b0338b 2019-11-29 stsp 		> /dev/null)
 818 38b0338b 2019-11-29 stsp 	local commit2=`git_show_head $testroot/repo`
 819 38b0338b 2019-11-29 stsp 
 820 38b0338b 2019-11-29 stsp 	# Simulate a situation where fast-forward is required. 
 821 38b0338b 2019-11-29 stsp 	# We want to fast-forward master to origin/master:
 822 38b0338b 2019-11-29 stsp 	# commit 3907e11dceaae2ca7f8db79c2af31794673945ad (origin/master)
 823 38b0338b 2019-11-29 stsp 	# commit ffcffcd102cf1af6572fbdbb4cf07a0f1fd2d840 (master)
 824 38b0338b 2019-11-29 stsp 	# commit 87a6a8a2263a15b61c016ff1720b24741d455eb5
 825 38b0338b 2019-11-29 stsp 	(cd $testroot/repo && got ref -d master)
 826 e31abbf2 2020-03-22 stsp 	(cd $testroot/repo && got ref -c $commit1 refs/heads/master)
 827 e31abbf2 2020-03-22 stsp 	(cd $testroot/repo && got ref -c $commit2 refs/remotes/origin/master)
 828 38b0338b 2019-11-29 stsp 
 829 38b0338b 2019-11-29 stsp 	(cd $testroot/wt && got up -b origin/master > /dev/null)
 830 38b0338b 2019-11-29 stsp 
 831 38b0338b 2019-11-29 stsp 	(cd $testroot/wt && got rebase master \
 832 38b0338b 2019-11-29 stsp 		> $testroot/stdout 2> $testroot/stderr)
 833 38b0338b 2019-11-29 stsp 
 834 38b0338b 2019-11-29 stsp 	echo "Forwarding refs/heads/master to commit $commit2" \
 835 38b0338b 2019-11-29 stsp 		> $testroot/stdout.expected
 836 38b0338b 2019-11-29 stsp 	echo "Switching work tree to refs/heads/master" \
 837 38b0338b 2019-11-29 stsp 		>> $testroot/stdout.expected
 838 38b0338b 2019-11-29 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 839 38b0338b 2019-11-29 stsp 	ret="$?"
 840 38b0338b 2019-11-29 stsp 	if [ "$ret" != "0" ]; then
 841 38b0338b 2019-11-29 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 842 38b0338b 2019-11-29 stsp 		test_done "$testroot" "$ret"
 843 38b0338b 2019-11-29 stsp 		return 1
 844 38b0338b 2019-11-29 stsp 	fi
 845 38b0338b 2019-11-29 stsp 
 846 38b0338b 2019-11-29 stsp 	# Ensure that rebase operation was completed correctly
 847 38b0338b 2019-11-29 stsp 	(cd $testroot/wt && got rebase -a \
 848 38b0338b 2019-11-29 stsp 		> $testroot/stdout 2> $testroot/stderr)
 849 38b0338b 2019-11-29 stsp 	echo -n "" > $testroot/stdout.expected
 850 38b0338b 2019-11-29 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 851 38b0338b 2019-11-29 stsp 	ret="$?"
 852 38b0338b 2019-11-29 stsp 	if [ "$ret" != "0" ]; then
 853 38b0338b 2019-11-29 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 854 38b0338b 2019-11-29 stsp 		test_done "$testroot" "$ret"
 855 38b0338b 2019-11-29 stsp 		return 1
 856 38b0338b 2019-11-29 stsp 	fi
 857 38b0338b 2019-11-29 stsp 	echo "got: rebase operation not in progress" > $testroot/stderr.expected
 858 38b0338b 2019-11-29 stsp 	cmp -s $testroot/stderr.expected $testroot/stderr
 859 38b0338b 2019-11-29 stsp 	ret="$?"
 860 38b0338b 2019-11-29 stsp 	if [ "$ret" != "0" ]; then
 861 38b0338b 2019-11-29 stsp 		diff -u $testroot/stderr.expected $testroot/stderr
 862 38b0338b 2019-11-29 stsp 		test_done "$testroot" "$ret"
 863 38b0338b 2019-11-29 stsp 		return 1
 864 38b0338b 2019-11-29 stsp 	fi
 865 38b0338b 2019-11-29 stsp 
 866 da76fce2 2020-02-24 stsp 	(cd $testroot/wt && got branch -n > $testroot/stdout)
 867 38b0338b 2019-11-29 stsp 	echo "master" > $testroot/stdout.expected
 868 38b0338b 2019-11-29 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 869 38b0338b 2019-11-29 stsp 	ret="$?"
 870 38b0338b 2019-11-29 stsp 	if [ "$ret" != "0" ]; then
 871 38b0338b 2019-11-29 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 872 38b0338b 2019-11-29 stsp 		test_done "$testroot" "$ret"
 873 38b0338b 2019-11-29 stsp 		return 1
 874 38b0338b 2019-11-29 stsp 	fi
 875 38b0338b 2019-11-29 stsp 
 876 38b0338b 2019-11-29 stsp 	(cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
 877 38b0338b 2019-11-29 stsp 	echo "commit $commit2 (master, origin/master)" > $testroot/stdout.expected
 878 38b0338b 2019-11-29 stsp 	echo "commit $commit1" >> $testroot/stdout.expected
 879 38b0338b 2019-11-29 stsp 	echo "commit $commit0" >> $testroot/stdout.expected
 880 38b0338b 2019-11-29 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 881 38b0338b 2019-11-29 stsp 	ret="$?"
 882 38b0338b 2019-11-29 stsp 	if [ "$ret" != "0" ]; then
 883 38b0338b 2019-11-29 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 884 38b0338b 2019-11-29 stsp 	fi
 885 38b0338b 2019-11-29 stsp 	test_done "$testroot" "$ret"
 886 38b0338b 2019-11-29 stsp }
 887 e51d7b55 2020-01-04 stsp 
 888 e51d7b55 2020-01-04 stsp function test_rebase_out_of_date {
 889 e51d7b55 2020-01-04 stsp 	local testroot=`test_init rebase_out_of_date`
 890 e51d7b55 2020-01-04 stsp 	local initial_commit=`git_show_head $testroot/repo`
 891 e51d7b55 2020-01-04 stsp 
 892 e51d7b55 2020-01-04 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
 893 e51d7b55 2020-01-04 stsp 	echo "modified delta on branch" > $testroot/repo/gamma/delta
 894 e51d7b55 2020-01-04 stsp 	git_commit $testroot/repo -m "committing to delta on newbranch"
 895 38b0338b 2019-11-29 stsp 
 896 e51d7b55 2020-01-04 stsp 	echo "modified alpha on branch" > $testroot/repo/alpha
 897 e51d7b55 2020-01-04 stsp 	(cd $testroot/repo && git rm -q beta)
 898 e51d7b55 2020-01-04 stsp 	echo "new file on branch" > $testroot/repo/epsilon/new
 899 e51d7b55 2020-01-04 stsp 	(cd $testroot/repo && git add epsilon/new)
 900 e51d7b55 2020-01-04 stsp 	git_commit $testroot/repo -m "committing more changes on newbranch"
 901 e51d7b55 2020-01-04 stsp 
 902 e51d7b55 2020-01-04 stsp 	local orig_commit1=`git_show_parent_commit $testroot/repo`
 903 e51d7b55 2020-01-04 stsp 	local orig_commit2=`git_show_head $testroot/repo`
 904 e51d7b55 2020-01-04 stsp 
 905 e51d7b55 2020-01-04 stsp 	(cd $testroot/repo && git checkout -q master)
 906 e51d7b55 2020-01-04 stsp 	echo "modified zeta on master" > $testroot/repo/epsilon/zeta
 907 e51d7b55 2020-01-04 stsp 	git_commit $testroot/repo -m "committing to zeta on master"
 908 e51d7b55 2020-01-04 stsp 	local master_commit1=`git_show_head $testroot/repo`
 909 e51d7b55 2020-01-04 stsp 
 910 e51d7b55 2020-01-04 stsp 	(cd $testroot/repo && git checkout -q master)
 911 e51d7b55 2020-01-04 stsp 	echo "modified beta on master" > $testroot/repo/beta
 912 e51d7b55 2020-01-04 stsp 	git_commit $testroot/repo -m "committing to beta on master"
 913 e51d7b55 2020-01-04 stsp 	local master_commit2=`git_show_head $testroot/repo`
 914 e51d7b55 2020-01-04 stsp 
 915 e51d7b55 2020-01-04 stsp 	got checkout -c $master_commit1 $testroot/repo $testroot/wt \
 916 e51d7b55 2020-01-04 stsp 		> /dev/null
 917 e51d7b55 2020-01-04 stsp 	ret="$?"
 918 e51d7b55 2020-01-04 stsp 	if [ "$ret" != "0" ]; then
 919 e51d7b55 2020-01-04 stsp 		test_done "$testroot" "$ret"
 920 e51d7b55 2020-01-04 stsp 		return 1
 921 e51d7b55 2020-01-04 stsp 	fi
 922 e51d7b55 2020-01-04 stsp 
 923 e51d7b55 2020-01-04 stsp 	(cd $testroot/wt && got rebase newbranch > $testroot/stdout \
 924 e51d7b55 2020-01-04 stsp 		2> $testroot/stderr)
 925 e51d7b55 2020-01-04 stsp 
 926 e51d7b55 2020-01-04 stsp 	echo -n > $testroot/stdout.expected
 927 e51d7b55 2020-01-04 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 928 e51d7b55 2020-01-04 stsp 	ret="$?"
 929 e51d7b55 2020-01-04 stsp 	if [ "$ret" != "0" ]; then
 930 e51d7b55 2020-01-04 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 931 e51d7b55 2020-01-04 stsp 		test_done "$testroot" "$ret"
 932 e51d7b55 2020-01-04 stsp 		return 1
 933 e51d7b55 2020-01-04 stsp 	fi
 934 e51d7b55 2020-01-04 stsp 
 935 e51d7b55 2020-01-04 stsp 	echo -n "got: work tree must be updated before it can be " \
 936 e51d7b55 2020-01-04 stsp 		> $testroot/stderr.expected
 937 e51d7b55 2020-01-04 stsp 	echo "used to rebase a branch" >> $testroot/stderr.expected
 938 e51d7b55 2020-01-04 stsp 	cmp -s $testroot/stderr.expected $testroot/stderr
 939 e51d7b55 2020-01-04 stsp 	ret="$?"
 940 e51d7b55 2020-01-04 stsp 	if [ "$ret" != "0" ]; then
 941 e51d7b55 2020-01-04 stsp 		diff -u $testroot/stderr.expected $testroot/stderr
 942 e51d7b55 2020-01-04 stsp 		test_done "$testroot" "$ret"
 943 e51d7b55 2020-01-04 stsp 		return 1
 944 e51d7b55 2020-01-04 stsp 	fi
 945 e51d7b55 2020-01-04 stsp 
 946 e51d7b55 2020-01-04 stsp 	(cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
 947 e51d7b55 2020-01-04 stsp 	echo "commit $master_commit2 (master)" > $testroot/stdout.expected
 948 e51d7b55 2020-01-04 stsp 	echo "commit $master_commit1" >> $testroot/stdout.expected
 949 e51d7b55 2020-01-04 stsp 	echo "commit $initial_commit" >> $testroot/stdout.expected
 950 1ae0a341 2020-02-14 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
 951 1ae0a341 2020-02-14 stsp 	ret="$?"
 952 1ae0a341 2020-02-14 stsp 	if [ "$ret" != "0" ]; then
 953 1ae0a341 2020-02-14 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 954 1ae0a341 2020-02-14 stsp 	fi
 955 1ae0a341 2020-02-14 stsp 	test_done "$testroot" "$ret"
 956 1ae0a341 2020-02-14 stsp }
 957 1ae0a341 2020-02-14 stsp 
 958 1ae0a341 2020-02-14 stsp function test_rebase_trims_empty_dir {
 959 1ae0a341 2020-02-14 stsp 	local testroot=`test_init rebase_trims_empty_dir`
 960 1ae0a341 2020-02-14 stsp 
 961 1ae0a341 2020-02-14 stsp 	(cd $testroot/repo && git checkout -q -b newbranch)
 962 1ae0a341 2020-02-14 stsp 	echo "modified delta on branch" > $testroot/repo/gamma/delta
 963 1ae0a341 2020-02-14 stsp 	git_commit $testroot/repo -m "committing to delta on newbranch"
 964 1ae0a341 2020-02-14 stsp 
 965 1ae0a341 2020-02-14 stsp 	(cd $testroot/repo && git rm -q epsilon/zeta)
 966 1ae0a341 2020-02-14 stsp 	git_commit $testroot/repo -m "removing zeta on newbranch"
 967 1ae0a341 2020-02-14 stsp 
 968 1ae0a341 2020-02-14 stsp 	local orig_commit1=`git_show_parent_commit $testroot/repo`
 969 1ae0a341 2020-02-14 stsp 	local orig_commit2=`git_show_head $testroot/repo`
 970 1ae0a341 2020-02-14 stsp 
 971 1ae0a341 2020-02-14 stsp 	(cd $testroot/repo && git checkout -q master)
 972 1ae0a341 2020-02-14 stsp 	echo "modified alpha on master" > $testroot/repo/alpha
 973 1ae0a341 2020-02-14 stsp 	git_commit $testroot/repo -m "committing to alpha on master"
 974 1ae0a341 2020-02-14 stsp 	local master_commit=`git_show_head $testroot/repo`
 975 1ae0a341 2020-02-14 stsp 
 976 1ae0a341 2020-02-14 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 977 1ae0a341 2020-02-14 stsp 	ret="$?"
 978 1ae0a341 2020-02-14 stsp 	if [ "$ret" != "0" ]; then
 979 1ae0a341 2020-02-14 stsp 		test_done "$testroot" "$ret"
 980 1ae0a341 2020-02-14 stsp 		return 1
 981 1ae0a341 2020-02-14 stsp 	fi
 982 1ae0a341 2020-02-14 stsp 
 983 1ae0a341 2020-02-14 stsp 	(cd $testroot/wt && got rebase newbranch > $testroot/stdout)
 984 1ae0a341 2020-02-14 stsp 
 985 1ae0a341 2020-02-14 stsp 	(cd $testroot/repo && git checkout -q newbranch)
 986 1ae0a341 2020-02-14 stsp 	local new_commit1=`git_show_parent_commit $testroot/repo`
 987 1ae0a341 2020-02-14 stsp 	local new_commit2=`git_show_head $testroot/repo`
 988 1ae0a341 2020-02-14 stsp 
 989 1ae0a341 2020-02-14 stsp 	local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
 990 1ae0a341 2020-02-14 stsp 	local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
 991 1ae0a341 2020-02-14 stsp 	local short_new_commit1=`trim_obj_id 28 $new_commit1`
 992 1ae0a341 2020-02-14 stsp 	local short_new_commit2=`trim_obj_id 28 $new_commit2`
 993 1ae0a341 2020-02-14 stsp 
 994 1ae0a341 2020-02-14 stsp 	echo "G  gamma/delta" >> $testroot/stdout.expected
 995 1ae0a341 2020-02-14 stsp 	echo -n "$short_orig_commit1 -> $short_new_commit1" \
 996 1ae0a341 2020-02-14 stsp 		>> $testroot/stdout.expected
 997 1ae0a341 2020-02-14 stsp 	echo ": committing to delta on newbranch" >> $testroot/stdout.expected
 998 1ae0a341 2020-02-14 stsp 	echo "D  epsilon/zeta" >> $testroot/stdout.expected
 999 1ae0a341 2020-02-14 stsp 	echo -n "$short_orig_commit2 -> $short_new_commit2" \
1000 1ae0a341 2020-02-14 stsp 		>> $testroot/stdout.expected
1001 1ae0a341 2020-02-14 stsp 	echo ": removing zeta on newbranch" \
1002 1ae0a341 2020-02-14 stsp 		>> $testroot/stdout.expected
1003 1ae0a341 2020-02-14 stsp 	echo "Switching work tree to refs/heads/newbranch" \
1004 1ae0a341 2020-02-14 stsp 		>> $testroot/stdout.expected
1005 1ae0a341 2020-02-14 stsp 
1006 e51d7b55 2020-01-04 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
1007 e51d7b55 2020-01-04 stsp 	ret="$?"
1008 e51d7b55 2020-01-04 stsp 	if [ "$ret" != "0" ]; then
1009 e51d7b55 2020-01-04 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
1010 1ae0a341 2020-02-14 stsp 		test_done "$testroot" "$ret"
1011 1ae0a341 2020-02-14 stsp 		return 1
1012 e51d7b55 2020-01-04 stsp 	fi
1013 1ae0a341 2020-02-14 stsp 
1014 1ae0a341 2020-02-14 stsp 	echo "modified delta on branch" > $testroot/content.expected
1015 1ae0a341 2020-02-14 stsp 	cat $testroot/wt/gamma/delta > $testroot/content
1016 1ae0a341 2020-02-14 stsp 	cmp -s $testroot/content.expected $testroot/content
1017 1ae0a341 2020-02-14 stsp 	ret="$?"
1018 1ae0a341 2020-02-14 stsp 	if [ "$ret" != "0" ]; then
1019 1ae0a341 2020-02-14 stsp 		diff -u $testroot/content.expected $testroot/content
1020 1ae0a341 2020-02-14 stsp 		test_done "$testroot" "$ret"
1021 1ae0a341 2020-02-14 stsp 		return 1
1022 1ae0a341 2020-02-14 stsp 	fi
1023 1ae0a341 2020-02-14 stsp 
1024 1ae0a341 2020-02-14 stsp 	echo "modified alpha on master" > $testroot/content.expected
1025 1ae0a341 2020-02-14 stsp 	cat $testroot/wt/alpha > $testroot/content
1026 1ae0a341 2020-02-14 stsp 	cmp -s $testroot/content.expected $testroot/content
1027 1ae0a341 2020-02-14 stsp 	ret="$?"
1028 1ae0a341 2020-02-14 stsp 	if [ "$ret" != "0" ]; then
1029 1ae0a341 2020-02-14 stsp 		diff -u $testroot/content.expected $testroot/content
1030 1ae0a341 2020-02-14 stsp 		test_done "$testroot" "$ret"
1031 1ae0a341 2020-02-14 stsp 		return 1
1032 1ae0a341 2020-02-14 stsp 	fi
1033 1ae0a341 2020-02-14 stsp 
1034 1ae0a341 2020-02-14 stsp 	if [ -e $testroot/wt/epsilon ]; then
1035 1ae0a341 2020-02-14 stsp 		echo "parent of removed zeta still exists on disk" >&2
1036 1ae0a341 2020-02-14 stsp 		test_done "$testroot" "1"
1037 1ae0a341 2020-02-14 stsp 		return 1
1038 1ae0a341 2020-02-14 stsp 	fi
1039 1ae0a341 2020-02-14 stsp 
1040 1ae0a341 2020-02-14 stsp 	(cd $testroot/wt && got status > $testroot/stdout)
1041 1ae0a341 2020-02-14 stsp 
1042 1ae0a341 2020-02-14 stsp 	echo -n > $testroot/stdout.expected
1043 1ae0a341 2020-02-14 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
1044 1ae0a341 2020-02-14 stsp 	ret="$?"
1045 1ae0a341 2020-02-14 stsp 	if [ "$ret" != "0" ]; then
1046 1ae0a341 2020-02-14 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
1047 1ae0a341 2020-02-14 stsp 		test_done "$testroot" "$ret"
1048 1ae0a341 2020-02-14 stsp 		return 1
1049 1ae0a341 2020-02-14 stsp 	fi
1050 1ae0a341 2020-02-14 stsp 
1051 1ae0a341 2020-02-14 stsp 	(cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1052 1ae0a341 2020-02-14 stsp 	echo "commit $new_commit2 (newbranch)" > $testroot/stdout.expected
1053 1ae0a341 2020-02-14 stsp 	echo "commit $new_commit1" >> $testroot/stdout.expected
1054 1ae0a341 2020-02-14 stsp 	echo "commit $master_commit (master)" >> $testroot/stdout.expected
1055 1ae0a341 2020-02-14 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
1056 1ae0a341 2020-02-14 stsp 	ret="$?"
1057 1ae0a341 2020-02-14 stsp 	if [ "$ret" != "0" ]; then
1058 1ae0a341 2020-02-14 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
1059 1ae0a341 2020-02-14 stsp 	fi
1060 e51d7b55 2020-01-04 stsp 	test_done "$testroot" "$ret"
1061 e51d7b55 2020-01-04 stsp }
1062 ca6da77d 2020-03-22 stsp 
1063 ca6da77d 2020-03-22 stsp function test_rebase_delete_missing_file {
1064 ca6da77d 2020-03-22 stsp 	local testroot=`test_init rebase_delete_missing_file`
1065 ca6da77d 2020-03-22 stsp 
1066 ca6da77d 2020-03-22 stsp 	mkdir -p $testroot/repo/d/f/g
1067 ca6da77d 2020-03-22 stsp 	echo "new file" > $testroot/repo/d/f/g/new
1068 ca6da77d 2020-03-22 stsp 	(cd $testroot/repo && git add d/f/g/new)
1069 ca6da77d 2020-03-22 stsp 	git_commit $testroot/repo -m "adding a subdir"
1070 ca6da77d 2020-03-22 stsp 	local commit0=`git_show_head $testroot/repo`
1071 ca6da77d 2020-03-22 stsp 
1072 a740a1b3 2020-03-22 stsp 	got br -r $testroot/repo -c master newbranch
1073 a740a1b3 2020-03-22 stsp 
1074 a740a1b3 2020-03-22 stsp 	got checkout -b newbranch $testroot/repo $testroot/wt > /dev/null
1075 ca6da77d 2020-03-22 stsp 
1076 a740a1b3 2020-03-22 stsp 	echo "modified delta on branch" > $testroot/wt/gamma/delta
1077 a740a1b3 2020-03-22 stsp 	(cd $testroot/wt && got commit \
1078 a740a1b3 2020-03-22 stsp 		-m "committing to delta on newbranch" > /dev/null)
1079 ca6da77d 2020-03-22 stsp 
1080 a740a1b3 2020-03-22 stsp 	(cd $testroot/wt && got rm beta d/f/g/new > /dev/null)
1081 a740a1b3 2020-03-22 stsp 	(cd $testroot/wt && got commit \
1082 a740a1b3 2020-03-22 stsp 		-m "removing beta and d/f/g/new on newbranch" > /dev/null)
1083 a740a1b3 2020-03-22 stsp 
1084 a740a1b3 2020-03-22 stsp 	(cd $testroot/repo && git checkout -q newbranch)
1085 ca6da77d 2020-03-22 stsp 	local orig_commit1=`git_show_parent_commit $testroot/repo`
1086 ca6da77d 2020-03-22 stsp 	local orig_commit2=`git_show_head $testroot/repo`
1087 ca6da77d 2020-03-22 stsp 
1088 a740a1b3 2020-03-22 stsp 	(cd $testroot/wt && got update -b master > /dev/null)
1089 a740a1b3 2020-03-22 stsp 	(cd $testroot/wt && got rm beta d/f/g/new > /dev/null)
1090 a740a1b3 2020-03-22 stsp 	(cd $testroot/wt && got commit \
1091 a740a1b3 2020-03-22 stsp 		-m "removing beta and d/f/g/new on master" > /dev/null)
1092 a740a1b3 2020-03-22 stsp 
1093 ca6da77d 2020-03-22 stsp 	(cd $testroot/repo && git checkout -q master)
1094 ca6da77d 2020-03-22 stsp 	local master_commit=`git_show_head $testroot/repo`
1095 ca6da77d 2020-03-22 stsp 
1096 a740a1b3 2020-03-22 stsp 	(cd $testroot/wt && got update -b master > /dev/null)
1097 ca6da77d 2020-03-22 stsp 	(cd $testroot/wt && got rebase newbranch > $testroot/stdout)
1098 ca6da77d 2020-03-22 stsp 
1099 ca6da77d 2020-03-22 stsp 	(cd $testroot/repo && git checkout -q newbranch)
1100 ca6da77d 2020-03-22 stsp 	local new_commit1=`git_show_head $testroot/repo`
1101 ca6da77d 2020-03-22 stsp 
1102 ca6da77d 2020-03-22 stsp 	local short_orig_commit1=`trim_obj_id 28 $orig_commit1`
1103 ca6da77d 2020-03-22 stsp 	local short_orig_commit2=`trim_obj_id 28 $orig_commit2`
1104 ca6da77d 2020-03-22 stsp 	local short_new_commit1=`trim_obj_id 28 $new_commit1`
1105 ca6da77d 2020-03-22 stsp 
1106 ca6da77d 2020-03-22 stsp 	echo "G  gamma/delta" >> $testroot/stdout.expected
1107 ca6da77d 2020-03-22 stsp 	echo -n "$short_orig_commit1 -> $short_new_commit1" \
1108 ca6da77d 2020-03-22 stsp 		>> $testroot/stdout.expected
1109 ca6da77d 2020-03-22 stsp 	echo ": committing to delta on newbranch" >> $testroot/stdout.expected
1110 ca6da77d 2020-03-22 stsp 	echo "!  beta" >> $testroot/stdout.expected
1111 ca6da77d 2020-03-22 stsp 	echo "!  d/f/g/new" >> $testroot/stdout.expected
1112 ca6da77d 2020-03-22 stsp 	echo -n "$short_orig_commit2 -> no-op change" \
1113 ca6da77d 2020-03-22 stsp 		>> $testroot/stdout.expected
1114 a740a1b3 2020-03-22 stsp 	echo ": removing beta and d/f/g/new on newbranch" \
1115 ca6da77d 2020-03-22 stsp 		>> $testroot/stdout.expected
1116 ca6da77d 2020-03-22 stsp 	echo "Switching work tree to refs/heads/newbranch" \
1117 ca6da77d 2020-03-22 stsp 		>> $testroot/stdout.expected
1118 ca6da77d 2020-03-22 stsp 
1119 ca6da77d 2020-03-22 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
1120 ca6da77d 2020-03-22 stsp 	ret="$?"
1121 ca6da77d 2020-03-22 stsp 	if [ "$ret" != "0" ]; then
1122 ca6da77d 2020-03-22 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
1123 ca6da77d 2020-03-22 stsp 		test_done "$testroot" "$ret"
1124 ca6da77d 2020-03-22 stsp 		return 1
1125 ca6da77d 2020-03-22 stsp 	fi
1126 ca6da77d 2020-03-22 stsp 
1127 ca6da77d 2020-03-22 stsp 	echo "modified delta on branch" > $testroot/content.expected
1128 ca6da77d 2020-03-22 stsp 	cat $testroot/wt/gamma/delta > $testroot/content
1129 ca6da77d 2020-03-22 stsp 	cmp -s $testroot/content.expected $testroot/content
1130 ca6da77d 2020-03-22 stsp 	ret="$?"
1131 ca6da77d 2020-03-22 stsp 	if [ "$ret" != "0" ]; then
1132 ca6da77d 2020-03-22 stsp 		diff -u $testroot/content.expected $testroot/content
1133 ca6da77d 2020-03-22 stsp 		test_done "$testroot" "$ret"
1134 ca6da77d 2020-03-22 stsp 		return 1
1135 ca6da77d 2020-03-22 stsp 	fi
1136 ca6da77d 2020-03-22 stsp 
1137 ca6da77d 2020-03-22 stsp 	if [ -e $testroot/wt/beta ]; then
1138 ca6da77d 2020-03-22 stsp 		echo "removed file beta still exists on disk" >&2
1139 ca6da77d 2020-03-22 stsp 		test_done "$testroot" "1"
1140 ca6da77d 2020-03-22 stsp 		return 1
1141 ca6da77d 2020-03-22 stsp 	fi
1142 ca6da77d 2020-03-22 stsp 
1143 ca6da77d 2020-03-22 stsp 	(cd $testroot/wt && got status > $testroot/stdout)
1144 ca6da77d 2020-03-22 stsp 
1145 ca6da77d 2020-03-22 stsp 	echo -n > $testroot/stdout.expected
1146 ca6da77d 2020-03-22 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
1147 ca6da77d 2020-03-22 stsp 	ret="$?"
1148 ca6da77d 2020-03-22 stsp 	if [ "$ret" != "0" ]; then
1149 ca6da77d 2020-03-22 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
1150 ca6da77d 2020-03-22 stsp 		test_done "$testroot" "$ret"
1151 ca6da77d 2020-03-22 stsp 		return 1
1152 ca6da77d 2020-03-22 stsp 	fi
1153 ca6da77d 2020-03-22 stsp 
1154 ca6da77d 2020-03-22 stsp 	(cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1155 ca6da77d 2020-03-22 stsp 	echo "commit $new_commit1 (newbranch)" > $testroot/stdout.expected
1156 ca6da77d 2020-03-22 stsp 	echo "commit $master_commit (master)" >> $testroot/stdout.expected
1157 ca6da77d 2020-03-22 stsp 	echo "commit $commit0" >> $testroot/stdout.expected
1158 ca6da77d 2020-03-22 stsp 	cmp -s $testroot/stdout.expected $testroot/stdout
1159 ca6da77d 2020-03-22 stsp 	ret="$?"
1160 ca6da77d 2020-03-22 stsp 	if [ "$ret" != "0" ]; then
1161 ca6da77d 2020-03-22 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
1162 ca6da77d 2020-03-22 stsp 	fi
1163 ca6da77d 2020-03-22 stsp 	test_done "$testroot" "$ret"
1164 ca6da77d 2020-03-22 stsp }
1165 ca6da77d 2020-03-22 stsp 
1166 dcf44d04 2019-07-11 stsp run_test test_rebase_basic
1167 dcf44d04 2019-07-11 stsp run_test test_rebase_ancestry_check
1168 dcf44d04 2019-07-11 stsp run_test test_rebase_continue
1169 dcf44d04 2019-07-11 stsp run_test test_rebase_abort
1170 ff0d2220 2019-07-11 stsp run_test test_rebase_no_op_change
1171 7d5807f4 2019-07-11 stsp run_test test_rebase_in_progress
1172 64c6d990 2019-07-11 stsp run_test test_rebase_path_prefix
1173 787c8eb6 2019-07-11 stsp run_test test_rebase_preserves_logmsg
1174 fc66b545 2019-08-12 stsp run_test test_rebase_no_commits_to_rebase
1175 38b0338b 2019-11-29 stsp run_test test_rebase_forward
1176 e51d7b55 2020-01-04 stsp run_test test_rebase_out_of_date
1177 1ae0a341 2020-02-14 stsp run_test test_rebase_trims_empty_dir
1178 ca6da77d 2020-03-22 stsp run_test test_rebase_delete_missing_file