From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=0.6 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: (qmail 16082 invoked by uid 111); 4 Nov 2007 09:12:10 -0000 Received: from vger.kernel.org (HELO vger.kernel.org) (209.132.176.167) by peff.net (qpsmtpd/0.32) with ESMTP; Sun, 04 Nov 2007 04:12:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754094AbXKDJMB (ORCPT ); Sun, 4 Nov 2007 04:12:01 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754108AbXKDJMB (ORCPT ); Sun, 4 Nov 2007 04:12:01 -0500 Received: from pan.madism.org ([88.191.52.104]:34040 "EHLO hermes.madism.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752237AbXKDJMA (ORCPT ); Sun, 4 Nov 2007 04:12:00 -0500 Received: from madism.org (olympe.madism.org [82.243.245.108]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "artemis.madism.org", Issuer "madism.org" (not verified)) by hermes.madism.org (Postfix) with ESMTP id 9DAE0285D5; Sun, 4 Nov 2007 10:11:58 +0100 (CET) Received: by madism.org (Postfix, from userid 1000) id 002341FED2; Sun, 4 Nov 2007 10:11:55 +0100 (CET) From: Pierre Habouzit To: gitster@pobox.com Cc: git@vger.kernel.org, Pierre Habouzit Subject: [UPDATED PATCH 3/5] Update git-sh-setup(1) to allow transparent use of git-rev-parse --parseopt Date: Sun, 4 Nov 2007 10:11:53 +0100 Message-Id: <1194167515-30378-1-git-send-email-madcoder@debian.org> X-Mailer: git-send-email 1.5.3.5.1498.g0a37d In-Reply-To: <7vd4uqtpza.fsf@gitster.siamese.dyndns.org> References: <7vd4uqtpza.fsf@gitster.siamese.dyndns.org> To: Junio C Hamano Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org If you set OPTIONS_SPEC, git-sh-setups uses git-rev-parse --parseopt automatically. It also diverts usage to re-exec $0 with the -h option as parse-options.c will catch that. PARSEOPT_OPTS can also be used to pass options git git-rev-parse --parseopt mode (like --keep-dashdash). Signed-off-by: Pierre Habouzit --- git-sh-setup.sh | 46 ++++++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 18 deletions(-) diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 86d7d4c..dfff0d1 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -16,9 +16,34 @@ die() { exit 1 } -usage() { - die "Usage: $0 $USAGE" -} +if test -n "$OPTIONS_SPEC"; then + # override this after . git-sh-setup if you need to use --keep-dashdash + PARSEOPT_OPTS= + usage() { + exec "$0" -h + } + + eval `echo "$OPTIONS_SPEC" | git rev-parse --parseopt $PARSEOPT_OPTS -- "$@" || echo exit $?` +else + usage() { + die "Usage: $0 $USAGE" + } + + if [ -z "$LONG_USAGE" ] + then + LONG_USAGE="Usage: $0 $USAGE" + else + LONG_USAGE="Usage: $0 $USAGE + +$LONG_USAGE" + fi + + case "$1" in + -h|--h|--he|--hel|--help) + echo "$LONG_USAGE" + exit + esac +fi set_reflog_action() { if [ -z "${GIT_REFLOG_ACTION:+set}" ] @@ -91,21 +116,6 @@ get_author_ident_from_commit () { LANG=C LC_ALL=C sed -ne "$pick_author_script" } -if [ -z "$LONG_USAGE" ] -then - LONG_USAGE="Usage: $0 $USAGE" -else - LONG_USAGE="Usage: $0 $USAGE - -$LONG_USAGE" -fi - -case "$1" in - -h|--h|--he|--hel|--help) - echo "$LONG_USAGE" - exit -esac - # Make sure we are in a valid repository of a vintage we understand. if [ -z "$SUBDIRECTORY_OK" ] then -- 1.5.3.5.1498.g0a37d