commit - 735ef5acf12acadb028a1ec180c877c45e631f5d
commit + b96228443755dfeee83c33a9366be74a0323f1ad
blob - 86ead4f26c71e8102ef14a49228b4deed16c7cd7
blob + c62f844a6d658b784464b3887910990df6b30b79
--- lib/worktree.c
+++ lib/worktree.c
@@ -3701,7 +3701,7 @@ check_rebase_ok(void *arg, struct got_fileindex_entry 
 	    == -1)
 		return got_error_from_errno("asprintf");
 
-	/* Reject rebase of a work tree with modified or conflicted files. */
+	/* Reject rebase of a work tree with modified or staged files. */
 	err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
 	free(ondisk_path);
 	if (err)
@@ -3709,6 +3709,8 @@ check_rebase_ok(void *arg, struct got_fileindex_entry 
 
 	if (status != GOT_STATUS_NO_CHANGE)
 		return got_error(GOT_ERR_MODIFIED);
+	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
+		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
 
 	return NULL;
 }
blob - 26db4abbe62fb899704e697f98df6334277086c2
blob + e433ff78645dfe41fc44487f6418bcae5e0abb00
--- regress/cmdline/stage.sh
+++ regress/cmdline/stage.sh
@@ -737,7 +737,63 @@ function test_stage_diff {
 	test_done "$testroot" "$ret"
 
 }
+
+function test_stage_histedit {
+	local testroot=`test_init stage_histedit`
+	local orig_commit=`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
+
+	echo "modified file" > $testroot/wt/alpha
+	(cd $testroot/wt && got stage alpha > /dev/null)
+
+	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`
+
+	echo "pick $old_commit1" > $testroot/histedit-script
+	echo "pick $old_commit2" >> $testroot/histedit-script
+
+	(cd $testroot/wt && got histedit -F $testroot/histedit-script \
+		> $testroot/stdout 2> $testroot/stderr)
+	ret="$?"
+	if [ "$ret" == "0" ]; then
+		echo "got histedit command succeeded unexpectedly" >&2
+		test_done "$testroot" "1"
+		return 1
+	fi
+
+	echo -n > $testroot/stdout.expected
+	echo "got: alpha: file is staged" > $testroot/stderr.expected
+
+	cmp -s $testroot/stderr.expected $testroot/stderr
+	ret="$?"
+	if [ "$ret" != "0" ]; then
+		diff -u $testroot/stderr.expected $testroot/stderr
+		test_done "$testroot" "$ret"
+		return 1
+	fi
+	cmp -s $testroot/stdout.expected $testroot/stdout
+	ret="$?"
+	if [ "$ret" != "0" ]; then
+		diff -u $testroot/stdout.expected $testroot/stdout
+	fi
+	test_done "$testroot" "$ret"
+
+}
+
 run_test test_stage_basic
 run_test test_stage_conflict
 run_test test_stage_out_of_date
@@ -747,3 +803,4 @@ run_test test_stage_add_already_staged_file
 run_test test_stage_rm_already_staged_file
 run_test test_stage_revert
 run_test test_stage_diff
+run_test test_stage_histedit