X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-rebase-script;h=a335b991782e56b9ce33520a4671539791ff4fb8;hb=3cd6ecda4a02e943934885910feeba957b730123;hp=7779813d11b92867219818de65a4cba50ca76758;hpb=f69714c38c6f3296a4bfba0d057e0f1605373f49;p=git.git

diff --git a/git-rebase-script b/git-rebase-script
index 7779813d..a335b991 100755
--- a/git-rebase-script
+++ b/git-rebase-script
@@ -17,18 +17,23 @@ case "$#,$1" in
     shift ;;
 esac
 
+git-update-cache --refresh || exit
+
 case "$#" in
-1) upstream=`git-rev-parse --verify "$1"` &&
-   ours=`git-rev-parse --verify HEAD` || exit
-   ;;
-2) upstream=`git-rev-parse --verify "$1"` &&
-   ours=`git-rev-parse --verify "$2"` || exit
-   ;;
-*) echo >&2 "$usage"; exit 1 ;;
+1) ours_symbolic=HEAD ;;
+2) ours_symbolic="$2" ;;
+*) die "$usage" ;;
 esac
 
+upstream=`git-rev-parse --verify "$1"` &&
+ours=`git-rev-parse --verify "$ours_symbolic"` || exit
+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 &&
-echo "$upstream" >"$GIT_DIR/HEAD" || exit
+git-rev-parse --verify "$upstream^0" >"$GIT_DIR/HEAD" || exit
 
 tmp=.rebase-tmp$$
 fail=$tmp-fail