From: Junio C Hamano <gitster@pobox.com> To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com> Cc: Johannes.Schindelin@gmx.de, avarab@gmail.com, git@vger.kernel.org, liu.denton@gmail.com Subject: Re: [PATCH v2] parse-options: don't emit "ambiguous option" for aliases Date: Tue, 07 May 2019 12:43:01 +0900 Message-ID: <xmqq1s1bnd4q.fsf@gitster-ct.c.googlers.com> (raw) In-Reply-To: <20190429100525.32045-1-pclouds@gmail.com> (=?utf-8?B?Ik5n?= =?utf-8?B?dXnhu4VuIFRow6FpIE5n4buNYw==?= Duy"'s message of "Mon, 29 Apr 2019 17:05:25 +0700") Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes: > But due to the way the options parsing machinery works this resulted > in the rather absurd situation of: > > $ git clone --recurs [...] > error: ambiguous option: recurs (could be --recursive or --recurse-submodules) > > Add OPT_ALIAS() to express this link between two or more options and use > it in git-clone. Multiple aliases of an option could be written as > > OPT_ALIAS(0, "alias1", "original-name"), > OPT_ALIAS(0, "alias2", "original-name"), > ... > > The current implementation is not exactly optimal in this case. But we > can optimize it when it becomes a problem. So far we don't even have two > aliases of any option. Sounds good enough for any practical need I can forsee ;-) Thanks. > diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh > index 800b3ea5f5..cebc77fab0 100755 > --- a/t/t0040-parse-options.sh > +++ b/t/t0040-parse-options.sh > @@ -48,6 +48,12 @@ Standard options > -q, --quiet be quiet > --expect <string> expected output in the variable dump > > +Alias > + -A, --alias-source <string> > + get a string > + -Z, --alias-target <string> > + get a string > + > EOF This is not a new problem per-se, as there already is a line before the precontext of this hunk that shares the same issue, but to prevent future problems, I am very much tempted to apply the attached on top. -- >8 -- Subject: t0040: protect lines that are indented by spaces This block is byte-for-byte identical expected output, that contains a few lines that are indented in many spaces, which makes "git diff --check" unhappy and will break the test when "git am --whitespace=fix" is allowed to "correct" them. Protect the left edge with a marker character, and strip it with sed, which is used as a standard way to deal with this issue in our test suite. Signed-off-by: Signed-off-by: Junio C Hamano <gitster@pobox.com> --- * Of course, if the right-edge need to be protected, we can do so as well. t/t0040-parse-options.sh | 94 ++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index cebc77fab0..26373b5b72 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -7,53 +7,53 @@ test_description='our own option parser' . ./test-lib.sh -cat >expect <<\EOF -usage: test-tool parse-options <options> - - A helper function for the parse-options API. - - --yes get a boolean - -D, --no-doubt begins with 'no-' - -B, --no-fear be brave - -b, --boolean increment by one - -4, --or4 bitwise-or boolean with ...0100 - --neg-or4 same as --no-or4 - - -i, --integer <n> get a integer - -j <n> get a integer, too - -m, --magnitude <n> get a magnitude - --set23 set integer to 23 - -L, --length <str> get length of <str> - -F, --file <file> set file to <file> - -String options - -s, --string <string> - get a string - --string2 <str> get another string - --st <st> get another string (pervert ordering) - -o <str> get another string - --list <str> add str to list - -Magic arguments - --quux means --quux - -NUM set integer to NUM - + same as -b - --ambiguous positive ambiguity - --no-ambiguous negative ambiguity - -Standard options - --abbrev[=<n>] use <n> digits to display SHA-1s - -v, --verbose be verbose - -n, --dry-run dry run - -q, --quiet be quiet - --expect <string> expected output in the variable dump - -Alias - -A, --alias-source <string> - get a string - -Z, --alias-target <string> - get a string - +sed -e 's/^|//' >expect <<\EOF +|usage: test-tool parse-options <options> +| +| A helper function for the parse-options API. +| +| --yes get a boolean +| -D, --no-doubt begins with 'no-' +| -B, --no-fear be brave +| -b, --boolean increment by one +| -4, --or4 bitwise-or boolean with ...0100 +| --neg-or4 same as --no-or4 +| +| -i, --integer <n> get a integer +| -j <n> get a integer, too +| -m, --magnitude <n> get a magnitude +| --set23 set integer to 23 +| -L, --length <str> get length of <str> +| -F, --file <file> set file to <file> +| +|String options +| -s, --string <string> +| get a string +| --string2 <str> get another string +| --st <st> get another string (pervert ordering) +| -o <str> get another string +| --list <str> add str to list +| +|Magic arguments +| --quux means --quux +| -NUM set integer to NUM +| + same as -b +| --ambiguous positive ambiguity +| --no-ambiguous negative ambiguity +| +|Standard options +| --abbrev[=<n>] use <n> digits to display SHA-1s +| -v, --verbose be verbose +| -n, --dry-run dry run +| -q, --quiet be quiet +| --expect <string> expected output in the variable dump +| +|Alias +| -A, --alias-source <string> +| get a string +| -Z, --alias-target <string> +| get a string +| EOF test_expect_success 'test help' '
next prev parent reply other threads:[~2019-05-07 3:43 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-25 18:14 [PATCH 0/8] Do not use abbreviated options in tests Johannes Schindelin via GitGitGadget 2019-03-25 18:14 ` [PATCH 1/8] tests (rebase): spell out the `--keep-empty` option Johannes Schindelin via GitGitGadget 2019-03-25 18:14 ` [PATCH 3/8] t7810: do not abbreviate `--no-exclude-standard` nor `--invert-match` Johannes Schindelin via GitGitGadget 2019-03-25 18:14 ` [PATCH 2/8] tests (rebase): spell out the `--force-rebase` option Johannes Schindelin via GitGitGadget 2019-03-25 18:14 ` [PATCH 4/8] t5531: avoid using an abbreviated option Johannes Schindelin via GitGitGadget 2019-03-25 18:14 ` [PATCH 5/8] tests (push): do not abbreviate the `--follow-tags` option Johannes Schindelin via GitGitGadget 2019-03-25 18:14 ` [PATCH 6/8] tests (status): spell out the `--find-renames` option in full Johannes Schindelin via GitGitGadget 2019-03-25 18:14 ` [PATCH 8/8] tests: disallow the use of abbreviated options (by default) Johannes Schindelin via GitGitGadget 2019-03-25 18:35 ` Denton Liu 2019-03-25 20:26 ` Ævar Arnfjörð Bjarmason 2019-04-12 8:48 ` Johannes Schindelin 2019-04-12 8:50 ` Johannes Schindelin 2019-03-25 19:47 ` Ævar Arnfjörð Bjarmason 2019-04-12 8:59 ` Johannes Schindelin 2019-03-25 18:14 ` [PATCH 7/8] tests (pack-objects): use the full, unabbreviated `--revs` option Johannes Schindelin via GitGitGadget 2019-03-25 20:23 ` [PATCH 0/2] allow for configuring option abbreviation + fix Ævar Arnfjörð Bjarmason 2019-03-25 20:23 ` [PATCH 1/2] parse-options: allow for configuring option abbreviation Ævar Arnfjörð Bjarmason 2019-03-25 21:23 ` Eric Sunshine 2019-03-25 22:47 ` Ævar Arnfjörð Bjarmason 2019-03-26 4:14 ` Duy Nguyen 2019-03-26 6:28 ` Ævar Arnfjörð Bjarmason 2019-03-26 7:13 ` Duy Nguyen 2019-03-26 11:00 ` Ævar Arnfjörð Bjarmason 2019-04-01 10:47 ` Junio C Hamano 2019-04-12 9:06 ` Johannes Schindelin 2019-03-25 20:23 ` [PATCH 2/2] parse-options: don't emit "ambiguous option" for aliases Ævar Arnfjörð Bjarmason 2019-04-17 12:44 ` [PATCH v2] " Ævar Arnfjörð Bjarmason 2019-04-17 16:04 ` Duy Nguyen 2019-04-18 0:48 ` Junio C Hamano 2019-04-18 9:29 ` Duy Nguyen 2019-04-19 4:39 ` Junio C Hamano 2019-04-22 12:22 ` [PATCH] " Nguyễn Thái Ngọc Duy 2019-04-22 12:34 ` Duy Nguyen 2019-04-29 10:05 ` [PATCH v2] " Nguyễn Thái Ngọc Duy 2019-05-07 3:43 ` Junio C Hamano [this message] 2019-05-07 11:58 ` Duy Nguyen 2019-04-02 0:58 ` [PATCH 0/8] Do not use abbreviated options in tests Junio C Hamano 2019-04-12 9:37 ` [PATCH v2 " Johannes Schindelin via GitGitGadget 2019-04-12 9:37 ` [PATCH v2 1/8] tests (rebase): spell out the `--keep-empty` option Johannes Schindelin via GitGitGadget 2019-04-12 9:37 ` [PATCH v2 3/8] t7810: do not abbreviate `--no-exclude-standard` nor `--invert-match` Johannes Schindelin via GitGitGadget 2019-04-12 9:37 ` [PATCH v2 2/8] tests (rebase): spell out the `--force-rebase` option Johannes Schindelin via GitGitGadget 2019-04-12 9:37 ` [PATCH v2 4/8] t5531: avoid using an abbreviated option Johannes Schindelin via GitGitGadget 2019-04-12 9:37 ` [PATCH v2 5/8] tests (push): do not abbreviate the `--follow-tags` option Johannes Schindelin via GitGitGadget 2019-04-12 9:37 ` [PATCH v2 7/8] tests (pack-objects): use the full, unabbreviated `--revs` option Johannes Schindelin via GitGitGadget 2019-04-12 9:37 ` [PATCH v2 6/8] tests (status): spell out the `--find-renames` option in full Johannes Schindelin via GitGitGadget 2019-04-12 9:37 ` [PATCH v2 8/8] tests: disallow the use of abbreviated options (by default) Johannes Schindelin via GitGitGadget 2019-04-14 2:35 ` Junio C Hamano 2019-04-15 2:55 ` Junio C Hamano 2019-04-15 13:09 ` Johannes Schindelin 2019-04-15 13:45 ` Junio C Hamano 2019-04-17 12:07 ` Johannes Schindelin 2019-04-15 13:08 ` Johannes Schindelin
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=xmqq1s1bnd4q.fsf@gitster-ct.c.googlers.com \ --to=gitster@pobox.com \ --cc=Johannes.Schindelin@gmx.de \ --cc=avarab@gmail.com \ --cc=git@vger.kernel.org \ --cc=liu.denton@gmail.com \ --cc=pclouds@gmail.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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git