diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-16 02:37:37 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-16 02:37:37 +0400 |
| commit | 2ad77e67c7c95982ebc9b99ee6a2d007feada62e (patch) | |
| tree | 2b83ba74f7de1bb01dbbd6bfa4b5dbf0bb0237e6 | |
| parent | a2f15a812c16cc0fa56a74af0e52d30ff4e615db (diff) | |
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>
| -rwxr-xr-x | git-rebase-script | 2 | ||||
| -rwxr-xr-x | git-reset-script | 4 | ||||
| -rwxr-xr-x | git-tag-script | 2 |
3 files changed, 4 insertions, 4 deletions
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 diff --git a/git-reset-script b/git-reset-script index 49994df7a2..7da8d86823 100755 --- a/git-reset-script +++ b/git-reset-script @@ -1,7 +1,7 @@ #!/bin/sh . git-sh-setup-script || die "Not a git archive" -rev=$(git-rev-parse --revs-only --verify --default HEAD "$@") || exit -rev=$(git-rev-parse --revs-only --verify $rev^0) || exit +rev=$(git-rev-parse --verify --default HEAD "$@") || exit +rev=$(git-rev-parse --verify $rev^0) || exit git-read-tree --reset "$rev" && { if orig=$(git-rev-parse --verify HEAD 2>/dev/null) then diff --git a/git-tag-script b/git-tag-script index d3074a8b3d..39c3c53987 100755 --- a/git-tag-script +++ b/git-tag-script @@ -47,7 +47,7 @@ if [ -e "$GIT_DIR/refs/tags/$name" -a -z "$force" ]; then fi shift -object=$(git-rev-parse --verify --revs-only --default HEAD "$@") || exit 1 +object=$(git-rev-parse --verify --default HEAD "$@") || exit 1 type=$(git-cat-file -t $object) || exit 1 tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1 |