Audit rev-parse users again.

Some callers to rev-parse were using the output selection flags
inconsistently.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-bisect-script b/git-bisect-script
index 29b25f4a4ce67a9d2532c617b93a9e5297cc4249..0c5c10750e34f76327df0f57ce26417b18dd8963 100755 (executable)
--- a/git-bisect-script
+++ b/git-bisect-script
@@ -58,7 +58,7 @@ bisect_start() {
 bisect_bad() {
        bisect_autostart
         case "$#" in 0 | 1) ;; *) usage ;; esac
 bisect_bad() {
        bisect_autostart
         case "$#" in 0 | 1) ;; *) usage ;; esac

-       rev=$(git-rev-parse --revs-only --verify --default HEAD "$@") || exit
+       rev=$(git-rev-parse --verify --default HEAD "$@") || exit

        echo "$rev" > "$GIT_DIR/refs/bisect/bad"
        bisect_auto_next
 }
        echo "$rev" > "$GIT_DIR/refs/bisect/bad"
        bisect_auto_next
 }


@@ -67,7 +67,7 @@ bisect_good() {
        bisect_autostart
         case "$#" in
        0)    revs=$(git-rev-parse --verify HEAD) || exit ;;
        bisect_autostart
         case "$#" in
        0)    revs=$(git-rev-parse --verify HEAD) || exit ;;

-       *)    revs=$(git-rev-parse --revs-only "$@") || exit ;;
+       *)    revs=$(git-rev-parse --revs-only --no-flags "$@") || exit ;;

        esac
        for rev in $revs
        do
        esac
        for rev in $revs
        do

diff --git a/git-branch-script b/git-branch-script
index a6dfeaf55fb917de346132a94e9d3d123223eecd..0ecbd239acf0d035ba1a7c9471c2b29b3bb4b884 100755 (executable)
--- a/git-branch-script
+++ b/git-branch-script
@@ -25,7 +25,7 @@ case "$#" in
        head="$2^0" ;;
 esac
 branchname="$1"
        head="$2^0" ;;
 esac
 branchname="$1"

-rev=$(git-rev-parse --revs-only --verify "$head") || exit
+rev=$(git-rev-parse --verify "$head") || exit

 
 [ -e "$GIT_DIR/refs/heads/$branchname" ] && die "$branchname already exists"
 
 
 [ -e "$GIT_DIR/refs/heads/$branchname" ] && die "$branchname already exists"
 

diff --git a/git-log-script b/git-log-script
index 9260f920559578feac9922a7c2ef781252567952..5716b29941bb5c005d0de63f916708a3fc774e01 100755 (executable)
--- a/git-log-script
+++ b/git-log-script
@@ -1,4 +1,4 @@
 #!/bin/sh
 #!/bin/sh

-revs=$(git-rev-parse --revs-only --default HEAD "$@") || exit
+revs=$(git-rev-parse --revs-only --no-flags --default HEAD "$@") || exit

 [ "$revs" ] || die "No HEAD ref"
 git-rev-list --pretty $(git-rev-parse --default HEAD "$@") | LESS=-S ${PAGER:-less}
 [ "$revs" ] || die "No HEAD ref"
 git-rev-list --pretty $(git-rev-parse --default HEAD "$@") | LESS=-S ${PAGER:-less}

diff --git a/git-request-pull-script b/git-request-pull-script
index 919081522942a1817b669422f28e045a2849d866..ae6cd272bab01ba7fa9ac7378fe33e07e853d307 100755 (executable)
--- a/git-request-pull-script
+++ b/git-request-pull-script
@@ -19,8 +19,8 @@ head=${3-HEAD}
 [ "$revision" ] || usage
 [ "$url" ] || usage
 
 [ "$revision" ] || usage
 [ "$url" ] || usage
 

-baserev=`git-rev-parse --verify $revision^0` &&
-headrev=`git-rev-parse --verify $head^0` || exit
+baserev=`git-rev-parse --verify "$revision"^0` &&
+headrev=`git-rev-parse --verify "$head"^0` || exit

 
 echo "The following changes since commit $baserev:"
 git log --max-count=1 --pretty=short "$baserev" |
 
 echo "The following changes since commit $baserev:"
 git log --max-count=1 --pretty=short "$baserev" |

diff --git a/git-revert-script b/git-revert-script
index dc2dea48987dce1e266cdb8da2086293b4811d68..22f2082fb1d9612fdc41b0edd7ec90327cfcf004 100755 (executable)
--- a/git-revert-script
+++ b/git-revert-script
@@ -10,7 +10,7 @@ case "$status" in
        die "Your working tree is dirty; cannot revert a previous patch." ;;
 esac
 
        die "Your working tree is dirty; cannot revert a previous patch." ;;
 esac
 

-rev=$(git-rev-parse --no-flags --verify --revs-only "$@") &&
+rev=$(git-rev-parse --verify "$@") &&

 commit=$(git-rev-parse --verify "$rev^0") || exit
 if git-diff-tree -R -M -p $commit | git-apply --index &&
    msg=$(git-rev-list --pretty=oneline --max-count=1 $commit)
 commit=$(git-rev-parse --verify "$rev^0") || exit
 if git-diff-tree -R -M -p $commit | git-apply --index &&
    msg=$(git-rev-list --pretty=oneline --max-count=1 $commit)