From 2ad77e67c7c95982ebc9b99ee6a2d007feada62e Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Mon, 15 Aug 2005 15:37:37 -0700
Subject: Audit rev-parse users.

Make sure that we say --verify when we want to get a single SHA1
name.  Also when we say --verify, --revs-only is redundant.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 git-rebase-script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git-rebase-script')

diff --git a/git-rebase-script b/git-rebase-script
index 7779813d11..026225ab2c 100755
--- 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
-- 
cgit v1.3