From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: Nicolas Vigier <boklm@mars-attacks.org>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 2/9] git-sh-setup.sh: add variable to use the stuck-long mode
Date: Fri, 24 Jan 2014 00:50:59 +0000 [thread overview]
Message-ID: <1390524666-51274-3-git-send-email-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <1390524666-51274-1-git-send-email-sandals@crustytoothpaste.net>
From: Nicolas Vigier <boklm@mars-attacks.org>
If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse
option parsing is done in --stuck-long mode.
Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
contrib/examples/git-checkout.sh | 1 +
contrib/examples/git-clean.sh | 1 +
contrib/examples/git-clone.sh | 1 +
contrib/examples/git-merge.sh | 1 +
contrib/examples/git-repack.sh | 1 +
contrib/git-resurrect.sh | 1 +
git-am.sh | 1 +
git-instaweb.sh | 1 +
git-quiltimport.sh | 1 +
git-rebase.sh | 1 +
git-request-pull.sh | 1 +
git-sh-setup.sh | 2 ++
12 files changed, 13 insertions(+)
diff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh
index 1a7689a..d7507ed 100755
--- a/contrib/examples/git-checkout.sh
+++ b/contrib/examples/git-checkout.sh
@@ -1,6 +1,7 @@
#!/bin/sh
OPTIONS_KEEPDASHDASH=t
+OPTIONS_STUCKLONG=
OPTIONS_SPEC="\
git-checkout [options] [<branch>] [<paths>...]
--
diff --git a/contrib/examples/git-clean.sh b/contrib/examples/git-clean.sh
index 01c95e9..9d881cd 100755
--- a/contrib/examples/git-clean.sh
+++ b/contrib/examples/git-clean.sh
@@ -4,6 +4,7 @@
#
OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
OPTIONS_SPEC="\
git-clean [options] <paths>...
diff --git a/contrib/examples/git-clone.sh b/contrib/examples/git-clone.sh
index 547228e..ea4757d 100755
--- a/contrib/examples/git-clone.sh
+++ b/contrib/examples/git-clone.sh
@@ -8,6 +8,7 @@
# See git-sh-setup why.
unset CDPATH
+OPTIONS_STUCKLONG=
OPTIONS_SPEC="\
git-clone [options] [--] <repo> [<dir>]
--
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index a5e42a9..f0243d5 100755
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -4,6 +4,7 @@
#
OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
OPTIONS_SPEC="\
git merge [options] <remote>...
git merge [options] <msg> HEAD <remote>
diff --git a/contrib/examples/git-repack.sh b/contrib/examples/git-repack.sh
index 7579331..fd5ced5 100755
--- a/contrib/examples/git-repack.sh
+++ b/contrib/examples/git-repack.sh
@@ -4,6 +4,7 @@
#
OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
OPTIONS_SPEC="\
git repack [options]
--
diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh
index a4ed4c3..d7e97bb 100755
--- a/contrib/git-resurrect.sh
+++ b/contrib/git-resurrect.sh
@@ -10,6 +10,7 @@ is rather slow but allows you to resurrect other people's topic
branches."
OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
OPTIONS_SPEC="\
git resurrect $USAGE
--
diff --git a/git-am.sh b/git-am.sh
index bbea430..a3b6f98 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -4,6 +4,7 @@
SUBDIRECTORY_OK=Yes
OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
OPTIONS_SPEC="\
git am [options] [(<mbox>|<Maildir>)...]
git am [options] (--continue | --skip | --abort)
diff --git a/git-instaweb.sh b/git-instaweb.sh
index e93a238..4aa3eb8 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -5,6 +5,7 @@
PERL='@@PERL@@'
OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
OPTIONS_SPEC="\
git instaweb [options] (--start | --stop | --restart)
--
diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 8e17525..167d79f 100755
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -1,5 +1,6 @@
#!/bin/sh
OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
OPTIONS_SPEC="\
git quiltimport [options]
--
diff --git a/git-rebase.sh b/git-rebase.sh
index 8a3efa2..c1f98ae 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -5,6 +5,7 @@
SUBDIRECTORY_OK=Yes
OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
OPTIONS_SPEC="\
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
diff --git a/git-request-pull.sh b/git-request-pull.sh
index fe21d5d..cf4f150 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -9,6 +9,7 @@ LONG_USAGE='Summarizes the changes between two commits to the standard output,
and includes the given URL in the generated summary.'
SUBDIRECTORY_OK='Yes'
OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
OPTIONS_SPEC='git request-pull [options] start url [end]
--
p show patch text as well
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index fffa3c7..5f28b32 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -72,6 +72,8 @@ if test -n "$OPTIONS_SPEC"; then
parseopt_extra=
[ -n "$OPTIONS_KEEPDASHDASH" ] &&
parseopt_extra="--keep-dashdash"
+ [ -n "$OPTIONS_STUCKLONG" ] &&
+ parseopt_extra="$parseopt_extra --stuck-long"
eval "$(
echo "$OPTIONS_SPEC" |
--
1.9.rc0.1002.gd081c64.dirty
next prev parent reply other threads:[~2014-01-24 0:51 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-24 0:50 [PATCH v2 0/9] add --gpg-sign to rebase and pull brian m. carlson
2014-01-24 0:50 ` [PATCH v2 1/9] cherry-pick, revert: add the --gpg-sign option brian m. carlson
2014-01-24 21:00 ` Junio C Hamano
2014-01-24 21:08 ` brian m. carlson
2014-01-24 22:45 ` Junio C Hamano
2014-01-24 0:50 ` brian m. carlson [this message]
2014-01-27 23:21 ` [PATCH v2 2/9] git-sh-setup.sh: add variable to use the stuck-long mode Junio C Hamano
2014-01-24 0:51 ` [PATCH v2 3/9] am: parse options in " brian m. carlson
2014-01-24 0:51 ` [PATCH v2 4/9] am: add the --gpg-sign option brian m. carlson
2014-01-27 23:26 ` Junio C Hamano
2014-01-24 0:51 ` [PATCH v2 5/9] rebase: remove useless arguments check brian m. carlson
2014-01-24 0:51 ` [PATCH v2 6/9] rebase: don't try to match -M option brian m. carlson
2014-01-24 0:51 ` [PATCH v2 7/9] rebase: parse options in stuck-long mode brian m. carlson
2014-01-24 0:51 ` [PATCH v2 8/9] rebase: add the --gpg-sign option brian m. carlson
2014-01-27 23:36 ` Junio C Hamano
2014-01-27 23:59 ` brian m. carlson
2014-01-24 0:51 ` [PATCH v2 9/9] pull: " brian m. carlson
2014-01-27 23:31 ` Junio C Hamano
2014-02-01 1:01 ` brian m. carlson
2014-02-03 18:04 ` Junio C Hamano
2014-01-24 9:14 ` [PATCH v2 0/9] add --gpg-sign to rebase and pull Nicolas Vigier
2014-01-24 20:06 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1390524666-51274-3-git-send-email-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=boklm@mars-attacks.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).