From f6e1a4d6dc4d1b3d82d5e87fdd817b3994dda5e0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 22 Jul 2005 19:09:05 -0700 Subject: [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: Junio C Hamano Signed-off-by: Junio C Hamano --- git-resolve-script | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git-resolve-script') diff --git a/git-resolve-script b/git-resolve-script index fffcb07df3..52dd83bae0 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -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() { -- cgit v1.2.3