summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a38e727)
raw | patch | inline | side by side (parent: a38e727)
author | Junio C Hamano <junkio@cox.net> | |
Sat, 23 Jul 2005 02:09:05 +0000 (19:09 -0700) | ||
committer | Linus Torvalds <torvalds@g5.osdl.org> | |
Sat, 23 Jul 2005 03:34:16 +0000 (20:34 -0700) |
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 <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
that is supposed to be a rev parameter to use "--verify".
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff --git a/git-checkout-script b/git-checkout-script
index 7e70338c476cfcf9ad51ce5d2a1f8e7ee93d705d..a37740713ed747a18b7ee5415e41e5bd57834c48 100755 (executable)
--- a/git-checkout-script
+++ b/git-checkout-script
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
index e2a1a2db9fda633c174c25df76d4307ec33ff643..f3bfbf3a4e381010755161167ddec2a64f68a17f 100755 (executable)
--- a/git-cherry
+++ b/git-cherry
'
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
index 04d16ae92f6a5d1e36eac9901806faa20f309984..dae487f3fd8b65534cd90a25312b56dd5403020e 100755 (executable)
--- a/git-commit-script
+++ b/git-commit-script
-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
index 10ab700d044d22509004182c5a5c55bafffc36d7..5b791c6bda49ff82fb562519711eb8c7abb6bc55 100755 (executable)
--- a/git-rebase-script
+++ b/git-rebase-script
: ${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
index fffcb07df3d020592c79de189ea2d762b0df7232..52dd83bae0d6ca95cc083cd6df06a289c51558a5 100755 (executable)
--- a/git-resolve-script
+++ b/git-resolve-script
#
. 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() {