kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
Junio C Hamano 2005-08-18 16:30:36 -07:00
parent d571c2be99
commit a8055f8a8e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase-script
View File

@ -27,7 +27,9 @@ esac


upstream=`git-rev-parse --verify "$1"` && upstream=`git-rev-parse --verify "$1"` &&
ours=`git-rev-parse --verify "$ours_symbolic"` || exit 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." die "Your working tree does not match $ours_symbolic."


git-read-tree -m -u $ours $upstream && git-read-tree -m -u $ours $upstream &&