summaryrefslogtreecommitdiff
path: root/git-rebase-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-15 22:37:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-15 22:37:37 (GMT)
commit2ad77e67c7c95982ebc9b99ee6a2d007feada62e (patch)
tree2b83ba74f7de1bb01dbbd6bfa4b5dbf0bb0237e6 /git-rebase-script
parenta2f15a812c16cc0fa56a74af0e52d30ff4e615db (diff)
downloadgit-2ad77e67c7c95982ebc9b99ee6a2d007feada62e.zip
git-2ad77e67c7c95982ebc9b99ee6a2d007feada62e.tar.gz
git-2ad77e67c7c95982ebc9b99ee6a2d007feada62e.tar.bz2
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>
Diffstat (limited to 'git-rebase-script')
-rwxr-xr-xgit-rebase-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase-script b/git-rebase-script
index 7779813..026225a 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