[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised

[git.git] / git-rebase-script

diff --git a/git-rebase-script b/git-rebase-script
index 7779813..026225a 100755 (executable)
--- a/git-rebase-script
+++ b/git-rebase-script
@@ -28,7 +28,7 @@ case "$#" in
 esac
 
 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