[PATCH] Fix test failure due to overly strict .git directory tests

diff --git a/git-rebase-script b/git-rebase-script
index 7779813d11b92867219818de65a4cba50ca76758..026225ab2cea131fcea00e5a5112dcd350f36eab 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