X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-rebase-script;h=5b791c6bda49ff82fb562519711eb8c7abb6bc55;hb=429a9358763dfb98cd063e40dc49cbc049e2a268;hp=10ab700d044d22509004182c5a5c55bafffc36d7;hpb=59e6b23acef9d29b9bdabc38ee80361e19ef7ebe;p=git.git diff --git a/git-rebase-script b/git-rebase-script index 10ab700d..5b791c6b 100755 --- 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