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 <[EMAIL PROTECTED]>
---
*** This does not have anything to do with the --sq flag.
git-checkout-script | 2 +-
git-cherry | 8 ++++----
git-commit-script | 2 +-
git-rebase-script | 8 ++++----
git-resolve-script | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
eee0f165b4762203c0d827bae7480daf41514f17
diff --git a/git-checkout-script b/git-checkout-script
--- a/git-checkout-script
+++ b/git-checkout-script
@@ -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
diff --git a/git-cherry b/git-cherry
--- a/git-cherry
+++ b/git-cherry
@@ -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
diff --git a/git-commit-script b/git-commit-script
--- a/git-commit-script
+++ b/git-commit-script
@@ -15,7 +15,7 @@ do
-m) shift
case "$#" in
0) usage ;;
- *) use_commit=`git-rev-parse "$1"` ||
+ *) use_commit=`git-rev-parse --verify "$1"` ||
exit ;;
esac
;;
diff --git a/git-rebase-script b/git-rebase-script
--- a/git-rebase-script
+++ b/git-rebase-script
@@ -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
diff --git a/git-resolve-script b/git-resolve-script
--- 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() {
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
