提交 a8055f8a 编写于 作者: J Junio C Hamano

Also make git-rebase-script stricter about dirty working tree.

Otherwise the first commit rebase makes could include whatever
dirty state the original working tree had.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 d571c2be
......@@ -27,7 +27,9 @@ esac
upstream=`git-rev-parse --verify "$1"` &&
ours=`git-rev-parse --verify "$ours_symbolic"` || exit
test "$(git-diff-cache --cached "$ours")" = "" ||
different1=$(git-diff-cache --name-only --cached "$ours") &&
different2=$(git-diff-cache --name-only "$ours") &&
test "$different1$different2" = "" ||
die "Your working tree does not match $ours_symbolic."
git-read-tree -m -u $ours $upstream &&
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册