From: Junio C Hamano <gitster@pobox.com>
To: Nicolas Vigier <boklm@mars-attacks.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] Use the word 'stuck' instead of 'sticked'
Date: Thu, 31 Oct 2013 12:35:33 -0700 [thread overview]
Message-ID: <xmqqbo255j3u.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1383217709-5518-2-git-send-email-boklm@mars-attacks.org> (Nicolas Vigier's message of "Thu, 31 Oct 2013 12:08:28 +0100")
Nicolas Vigier <boklm@mars-attacks.org> writes:
> The past participle of 'stick' is 'stuck'.
>
> Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
> ---
Thanks.
It was good that we caught this before introducing the option; the
documentation update does not hurt the users much, but if we unleash
a misspelled option in a release, it is much harder to correct it
later.
Will queue both patches.
> Documentation/gitcli.txt | 6 +++---
> Documentation/technical/api-parse-options.txt | 6 +++---
> diff.c | 2 +-
> diff.h | 2 +-
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
> index 3146413cce0d..c87f0ae88d6c 100644
> --- a/Documentation/gitcli.txt
> +++ b/Documentation/gitcli.txt
> @@ -72,11 +72,11 @@ scripting Git:
> * splitting short options to separate words (prefer `git foo -a -b`
> to `git foo -ab`, the latter may not even work).
>
> - * when a command line option takes an argument, use the 'sticked' form. In
> + * when a command line option takes an argument, use the 'stuck' form. In
> other words, write `git foo -oArg` instead of `git foo -o Arg` for short
> options, and `git foo --long-opt=Arg` instead of `git foo --long-opt Arg`
> for long options. An option that takes optional option-argument must be
> - written in the 'sticked' form.
> + written in the 'stuck' form.
>
> * when you give a revision parameter to a command, make sure the parameter is
> not ambiguous with a name of a file in the work tree. E.g. do not write
> @@ -165,7 +165,7 @@ $ git foo -o Arg
> ----------------------------
>
> However, this is *NOT* allowed for switches with an optional value, where the
> -'sticked' form must be used:
> +'stuck' form must be used:
> ----------------------------
> $ git describe --abbrev HEAD # correct
> $ git describe --abbrev=10 HEAD # correct
> diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
> index 0be2b5159f1b..be50cf4de35c 100644
> --- a/Documentation/technical/api-parse-options.txt
> +++ b/Documentation/technical/api-parse-options.txt
> @@ -29,9 +29,9 @@ that allow to change the behavior of a command.
>
> The parse-options API allows:
>
> -* 'sticked' and 'separate form' of options with arguments.
> - `-oArg` is sticked, `-o Arg` is separate form.
> - `--option=Arg` is sticked, `--option Arg` is separate form.
> +* 'stuck' and 'separate form' of options with arguments.
> + `-oArg` is stuck, `-o Arg` is separate form.
> + `--option=Arg` is stuck, `--option Arg` is separate form.
>
> * Long options may be 'abbreviated', as long as the abbreviation
> is unambiguous.
> diff --git a/diff.c b/diff.c
> index e34bf971207f..3950e0191067 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -3394,7 +3394,7 @@ int parse_long_opt(const char *opt, const char **argv,
> if (prefixcmp(arg, opt))
> return 0;
> arg += strlen(opt);
> - if (*arg == '=') { /* sticked form: --option=value */
> + if (*arg == '=') { /* stuck form: --option=value */
> *optarg = arg + 1;
> return 1;
> }
> diff --git a/diff.h b/diff.h
> index e34232501ee8..1c05b3a6bec6 100644
> --- a/diff.h
> +++ b/diff.h
> @@ -244,7 +244,7 @@ extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *pat
> #define DIFF_SETUP_USE_SIZE_CACHE 4
>
> /*
> - * Poor man's alternative to parse-option, to allow both sticked form
> + * Poor man's alternative to parse-option, to allow both stuck form
> * (--option=value) and separate form (--option value).
> */
> extern int parse_long_opt(const char *opt, const char **argv,
next prev parent reply other threads:[~2013-10-31 19:35 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-15 12:00 [PATCH] rev-parse --parseopt: fix handling of optional arguments Nicolas Vigier
2013-10-15 22:55 ` Junio C Hamano
2013-10-15 23:47 ` Nicolas Vigier
2013-10-15 23:14 ` Jonathan Nieder
2013-10-15 23:33 ` Junio C Hamano
2013-10-15 23:57 ` Jonathan Nieder
2013-10-16 7:04 ` Johannes Sixt
2013-10-16 8:53 ` Jeff King
2013-10-16 21:40 ` Junio C Hamano
2013-10-16 21:50 ` Jeff King
2013-10-16 10:58 ` Nicolas Vigier
2013-10-16 14:14 ` Nicolas Vigier
2013-10-16 22:33 ` Jonathan Nieder
2013-10-25 20:18 ` [PATCH] rev-parse --parseopt: add the --sticked-long mode Nicolas Vigier
2013-10-25 22:01 ` Junio C Hamano
2013-10-25 22:52 ` Nicolas Vigier
2013-10-25 22:55 ` Junio C Hamano
2013-10-26 21:55 ` Philip Oakley
2013-10-28 15:47 ` Junio C Hamano
2013-10-31 11:08 ` sticked -> stuck Nicolas Vigier
2013-10-31 11:08 ` [PATCH 1/2] Use the word 'stuck' instead of 'sticked' Nicolas Vigier
2013-10-31 19:35 ` Junio C Hamano [this message]
2013-10-31 11:08 ` [PATCH 2/2] rev-parse --parseopt: add the --stuck-long mode Nicolas Vigier
2013-10-27 5:45 ` [PATCH] rev-parse --parseopt: add the --sticked-long mode Michael Haggerty
2013-10-15 23:53 ` [PATCH] rev-parse --parseopt: fix handling of optional arguments Nicolas Vigier
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbo255j3u.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=boklm@mars-attacks.org \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).