提交 f6e1a4d6 编写于 作者: J Junio C Hamano 提交者: Linus Torvalds

[PATCH] Audit rev-parse users.

This patch changes rev-parse users that pass a single argument
that is supposed to be a rev parameter to use "--verify".
Signed-off-by: NJunio C Hamano <junkio@cox.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 a38e7279
......@@ -22,7 +22,7 @@ while [ "$#" != "0" ]; do
force=1
;;
*)
rev=$(git-rev-parse --verify --revs-only "$arg^0") || exit
rev=$(git-rev-parse --verify "$arg^0") || exit
if [ -z "$rev" ]; then
echo "unknown flag $arg"
exit 1
......
......@@ -28,11 +28,11 @@ The output is intended to be used as:
'
case "$#" in
1) linus=`git-rev-parse "$1"` &&
junio=`git-rev-parse HEAD` || exit
1) linus=`git-rev-parse --verify "$1"` &&
junio=`git-rev-parse --verify HEAD` || exit
;;
2) linus=`git-rev-parse "$1"` &&
junio=`git-rev-parse "$2"` || exit
2) linus=`git-rev-parse --verify "$1"` &&
junio=`git-rev-parse --verify "$2"` || exit
;;
*) echo >&2 "$usage"; exit 1 ;;
esac
......
......@@ -16,7 +16,7 @@ do
-m) shift
case "$#" in
0) usage ;;
*) use_commit=`git-rev-parse "$1"` ||
*) use_commit=`git-rev-parse --verify "$1"` ||
exit ;;
esac
;;
......
......@@ -11,11 +11,11 @@ upstream tree.'
: ${GIT_DIR=.git}
case "$#" in
1) linus=`git-rev-parse "$1"` &&
junio=`git-rev-parse HEAD` || exit
1) linus=`git-rev-parse --verify "$1"` &&
junio=`git-rev-parse --verify HEAD` || exit
;;
2) linus=`git-rev-parse "$1"` &&
junio=`git-rev-parse "$2"` || exit
2) linus=`git-rev-parse --verify "$1"` &&
junio=`git-rev-parse --verify "$2"` || exit
;;
*) echo >&2 "$usage"; exit 1 ;;
esac
......
......@@ -6,8 +6,8 @@
#
. git-sh-setup-script || die "Not a git archive"
head=$(git-rev-parse --revs-only "$1")
merge=$(git-rev-parse --revs-only "$2")
head=$(git-rev-parse --verify "$1")
merge=$(git-rev-parse --verify "$2")
merge_msg="$3"
dropheads() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册