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: Junio C Hamano <junkio@cox.net>maint
parent
d571c2be99
commit
a8055f8a8e
|
@ -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 &&
|
||||
|
|
Loading…
Reference in New Issue