commit 0def28b1b50dd3f59a6207d93034b2b1f77e602e
from: Stefan Sperling <stsp@stsp.name>
date: Sat Aug 17 08:15:35 2019 UTC

fix 'last commit cannot be folded' check with reordered commits

commit - 0350c0119892ba59800e9ff1f9fc1c3c4693a626
commit + 0def28b1b50dd3f59a6207d93034b2b1f77e602e
blob - 7de4b717192b41fe48ef99cde61a4849e8c35e94
blob + 6885219c58b049333695639f04b6d0f8a55b0306
--- got/got.c
+++ got/got.c
@@ -5009,7 +5009,8 @@ histedit_check_script(struct got_histedit_list *histed
 		}
 	}
 
-	if (hle->cmd->code == GOT_HISTEDIT_FOLD)
+	hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
+	if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
 		    "last commit in histedit script cannot be folded");
 
blob - 5aa888aaf5941ced7ac6eb946be7800afa259b49
blob + 30628b7335d56d07f5f457ffd0a6b1150e635785
--- regress/cmdline/histedit.sh
+++ regress/cmdline/histedit.sh
@@ -1114,7 +1114,72 @@ function test_histedit_outside_refs_heads {
 	ret="$?"
 	if [ "$ret" != "0" ]; then
 		diff -u $testroot/stderr.expected $testroot/stderr
+	fi
+	test_done "$testroot" "$ret"
+}
+
+function test_histedit_fold_last_commit_swap {
+	local testroot=`test_init histedit_fold_last_commit_swap`
+
+	local orig_commit=`git_show_head $testroot/repo`
+
+	echo "modified alpha on master" > $testroot/repo/alpha
+	(cd $testroot/repo && git rm -q beta)
+	echo "new file on master" > $testroot/repo/epsilon/new
+	(cd $testroot/repo && git add epsilon/new)
+	git_commit $testroot/repo -m "committing changes"
+	local old_commit1=`git_show_head $testroot/repo`
+
+	echo "modified zeta on master" > $testroot/repo/epsilon/zeta
+	git_commit $testroot/repo -m "committing to zeta on master"
+	local old_commit2=`git_show_head $testroot/repo`
+
+	got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
+	ret="$?"
+	if [ "$ret" != "0" ]; then
+		test_done "$testroot" "$ret"
+		return 1
+	fi
+
+	# fold commit2 into commit1 (requires swapping commits)
+	echo "fold $old_commit2" > $testroot/histedit-script
+	echo "pick $old_commit1" >> $testroot/histedit-script
+	echo "mesg committing folded changes" >> $testroot/histedit-script
+
+	(cd $testroot/wt && got histedit -F $testroot/histedit-script \
+		> $testroot/stdout 2> $testroot/stderr)
+
+	ret="$?"
+	if [ "$ret" != "0" ]; then
+		echo "histedit failed unexpectedly" >&2
+		test_done "$testroot" "$ret"
+		return 1
 	fi
+
+	local new_commit=`git_show_head $testroot/repo`
+
+	local short_old_commit1=`trim_obj_id 28 $old_commit1`
+	local short_old_commit2=`trim_obj_id 28 $old_commit2`
+	local short_new_commit=`trim_obj_id 28 $new_commit`
+
+	echo "G  epsilon/zeta" >> $testroot/stdout.expected
+	echo -n "$short_old_commit2 ->  fold commit: committing to zeta " \
+		>> $testroot/stdout.expected
+	echo "on master" >> $testroot/stdout.expected
+	echo "G  alpha" >> $testroot/stdout.expected
+	echo "D  beta" >> $testroot/stdout.expected
+	echo "A  epsilon/new" >> $testroot/stdout.expected
+	echo -n "$short_old_commit1 -> $short_new_commit: " \
+		>> $testroot/stdout.expected
+	echo "committing folded changes" >> $testroot/stdout.expected
+	echo "Switching work tree to refs/heads/master" \
+		>> $testroot/stdout.expected
+
+	cmp -s $testroot/stdout.expected $testroot/stdout
+	ret="$?"
+	if [ "$ret" != "0" ]; then
+		diff -u $testroot/stdout.expected $testroot/stdout
+	fi
 	test_done "$testroot" "$ret"
 }
 
@@ -1129,3 +1194,4 @@ run_test test_histedit_abort
 run_test test_histedit_path_prefix_drop
 run_test test_histedit_path_prefix_edit
 run_test test_histedit_outside_refs_heads
+run_test test_histedit_fold_last_commit_swap