diff options
author | Junio C Hamano <junkio@cox.net> | 2005-08-15 15:37:37 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-15 15:37:37 -0700 |
commit | 2ad77e67c7c95982ebc9b99ee6a2d007feada62e (patch) | |
tree | 2b83ba74f7de1bb01dbbd6bfa4b5dbf0bb0237e6 /git-rebase-script | |
parent | a2f15a812c16cc0fa56a74af0e52d30ff4e615db (diff) | |
download | git-2ad77e67c7c95982ebc9b99ee6a2d007feada62e.tar.gz git-2ad77e67c7c95982ebc9b99ee6a2d007feada62e.tar.xz |
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-x | git-rebase-script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase-script b/git-rebase-script index 7779813d1..026225ab2 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 |