From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>
Subject: Re: [PATCH v3 42/42] git-completion.bash: add GIT_COMPLETION_OPTIONS=all config
Date: Fri, 09 Feb 2018 15:19:57 +0100 [thread overview]
Message-ID: <877ermmeia.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20180209110221.27224-43-pclouds@gmail.com>
On Fri, Feb 09 2018, Nguyễn Thái Ngọc Duy jotted:
> By default, some option names (mostly --force, scripting related or for
> internal use) are not completable for various reasons. When
> GIT_COMPLETION_OPTIONS is set to all, all options (except hidden ones)
> are completable.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> contrib/completion/git-completion.bash | 6 +++++-
> parse-options.c | 11 +++++++----
> 2 files changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 0ddf40063b..0cfa489a8e 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -36,6 +36,10 @@
> #
> # When set to "1", do not include "DWIM" suggestions in git-checkout
> # completion (e.g., completing "foo" when "origin/foo" exists).
> +#
> +# GIT_COMPLETION_OPTIONS
> +#
> +# When set to "all", complete all possible options
I was going to suggest some wording like:
When set to "all", include options considered unsafe such as --force
in the completion.
However per your cover letter it's not just used for that:
10 --force
4 --rerere-autoupdate
1 --unsafe-paths
1 --thin
1 --overwrite-ignore
1 --open-files-in-pager
1 --null
1 --ext-grep
1 --exit-code
1 --auto
I wonder if we shouldn't just make this only about --force, I don't see
why "git grep --o<TAB>" should only show --or but not
--open-files-in-pager, and e.g. "git grep --<TAB>" is already verbose so
we're not saving much by excluding those.
Then this could just become:
GIT_COMPLETION_SHOWUNSAFEOPTIONS=1
Or other similar boolean variable, for consistency with all the "*SHOW*
variables already in git-completion.bash.
> case "$COMP_WORDBREAKS" in
> *:*) : great ;;
> @@ -303,7 +307,7 @@ __gitcomp_builtin ()
> if [ -z "$options" ]; then
> # leading and trailing spaces are significant to make
> # option removal work correctly.
> - options=" $(__git ${cmd/_/ } --git-completion-helper) $incl "
> + options=" $(__git ${cmd/_/ } --git-completion-helper=$GIT_COMPLETION_OPTIONS) $incl "
> for i in $excl; do
> options="${options/ $i / }"
> done
> diff --git a/parse-options.c b/parse-options.c
> index 979577ba2c..5b8b2b376e 100644
> --- a/parse-options.c
> +++ b/parse-options.c
> @@ -430,14 +430,17 @@ void parse_options_start(struct parse_opt_ctx_t *ctx,
> * many options that do not suppress it properly.
> */
> static int show_gitcomp(struct parse_opt_ctx_t *ctx,
> - const struct option *opts)
> + const struct option *opts,
> + const char *arg)
> {
> for (; opts->type != OPTION_END; opts++) {
> const char *suffix = "";
>
> if (!opts->long_name)
> continue;
> - if (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE))
> + if (opts->flags & PARSE_OPT_HIDDEN)
> + continue;
> + if ((opts->flags & PARSE_OPT_NOCOMPLETE) && strcmp(arg, "all"))
> continue;
>
> switch (opts->type) {
> @@ -498,8 +501,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
> goto show_usage;
>
> /* lone --git-completion-helper is asked by git-completion.bash */
> - if (ctx->total == 1 && !strcmp(arg + 1, "-git-completion-helper"))
> - return show_gitcomp(ctx, options);
> + if (ctx->total == 1 && skip_prefix(arg + 1, "-git-completion-helper=", &arg))
> + return show_gitcomp(ctx, options, arg);
>
> if (arg[1] != '-') {
> ctx->opt = arg + 1;
next prev parent reply other threads:[~2018-02-09 14:20 UTC|newest]
Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-31 11:05 [PATCH v2 00/41] Automate updating git-completion.bash a bit Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 01/41] parse-options: support --git-completion-helper Nguyễn Thái Ngọc Duy
2018-01-31 20:22 ` Eric Sunshine
2018-01-31 21:04 ` Eric Sunshine
2018-02-01 0:05 ` Duy Nguyen
2018-02-01 9:54 ` Eric Sunshine
2018-02-01 10:21 ` Duy Nguyen
2018-02-01 19:16 ` Eric Sunshine
2018-02-05 9:56 ` Duy Nguyen
2018-02-06 5:04 ` Eric Sunshine
2018-02-07 23:41 ` SZEDER Gábor
2018-02-05 10:46 ` Ævar Arnfjörð Bjarmason
2018-02-05 11:22 ` Duy Nguyen
2018-01-31 11:05 ` [PATCH v2 02/41] parse-options: add OPT_xxx_F() variants Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 03/41] parse-options: let OPT__FORCE take optional flags argument Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 04/41] git-completion.bash: introduce __gitcomp_builtin Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 05/41] completion: use __gitcomp_builtin in _git_add Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 06/41] completion: use __gitcomp_builtin in _git_am Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 07/41] completion: use __gitcomp_builtin in _git_apply Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 08/41] completion: use __gitcomp_builtin in _git_branch Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 09/41] completion: use __gitcomp_builtin in _git_checkout Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 10/41] completion: use __gitcomp_builtin in _git_cherry_pick Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 11/41] completion: use __gitcomp_builtin in _git_clean Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 12/41] completion: use __gitcomp_builtin in _git_clone Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 13/41] completion: use __gitcomp_builtin in _git_commit Nguyễn Thái Ngọc Duy
2018-01-31 20:42 ` Eric Sunshine
2018-01-31 11:05 ` [PATCH v2 14/41] completion: use __gitcomp_builtin in _git_config Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 15/41] completion: use __gitcomp_builtin in _git_describe Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 16/41] completion: use __gitcomp_builtin in _git_difftool Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 17/41] completion: use __gitcomp_builtin in _git_fetch Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 18/41] completion: use __gitcomp_builtin in _git_fsck Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 19/41] completion: use __gitcomp_builtin in _git_gc Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 20/41] completion: use __gitcomp_builtin in _git_grep Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 21/41] completion: use __gitcomp_builtin in _git_help Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 22/41] completion: use __gitcomp_builtin in _git_init Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 23/41] completion: use __gitcomp_builtin in _git_ls_files Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 24/41] completion: use __gitcomp_builtin in _git_ls_remote Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 25/41] completion: use __gitcomp_builtin in _git_merge Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 26/41] completion: use __gitcomp_builtin in _git_merge_base Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 27/41] completion: use __gitcomp_builtin in _git_mv Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 28/41] completion: use __gitcomp_builtin in _git_name_rev Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 29/41] completion: use __gitcomp_builtin in _git_notes Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 30/41] completion: use __gitcomp_builtin in _git_pull Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 31/41] completion: use __gitcomp_builtin in _git_push Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 32/41] completion: use __gitcomp_builtin in _git_remote Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 33/41] remote: force completing --mirror= instead of --mirror Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 34/41] completion: use __gitcomp_builtin in _git_replace Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 35/41] completion: use __gitcomp_builtin in _git_reset Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 36/41] completion: use __gitcomp_builtin in _git_revert Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 37/41] completion: use __gitcomp_builtin in _git_rm Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 38/41] completion: use __gitcomp_builtin in _git_show_branch Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 39/41] completion: use __gitcomp_builtin in _git_status Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 40/41] completion: use __gitcomp_builtin in _git_tag Nguyễn Thái Ngọc Duy
2018-01-31 11:05 ` [PATCH v2 41/41] completion: use __gitcomp_builtin in _git_worktree Nguyễn Thái Ngọc Duy
2018-01-31 15:01 ` [PATCH v2 00/41] Automate updating git-completion.bash a bit Ævar Arnfjörð Bjarmason
2018-02-07 19:23 ` Junio C Hamano
2018-02-08 12:05 ` Duy Nguyen
2018-02-09 11:01 ` [PATCH v3 00/42] " Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 01/42] parse-options: support --git-completion-helper Nguyễn Thái Ngọc Duy
2018-12-02 13:41 ` Ævar Arnfjörð Bjarmason
2018-12-09 10:27 ` [PATCH] parse-options: fix SunCC compiler warning Nguyễn Thái Ngọc Duy
2018-12-10 6:36 ` Junio C Hamano
2018-12-10 15:26 ` Duy Nguyen
2018-12-11 2:13 ` Junio C Hamano
2018-12-11 15:40 ` Duy Nguyen
2018-12-12 7:50 ` Junio C Hamano
2018-12-11 15:35 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 02/42] parse-options: add OPT_xxx_F() variants Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 03/42] parse-options: let OPT__FORCE take optional flags argument Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 04/42] git-completion.bash: introduce __gitcomp_builtin Nguyễn Thái Ngọc Duy
2018-02-09 18:59 ` Junio C Hamano
2018-02-14 15:35 ` SZEDER Gábor
2018-02-23 10:30 ` Duy Nguyen
2018-02-09 11:01 ` [PATCH v3 05/42] completion: use __gitcomp_builtin in _git_add Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 06/42] completion: use __gitcomp_builtin in _git_am Nguyễn Thái Ngọc Duy
2018-02-14 12:53 ` SZEDER Gábor
2018-02-22 9:13 ` Duy Nguyen
2018-02-22 18:19 ` Junio C Hamano
2018-02-23 10:17 ` Duy Nguyen
2018-02-23 18:08 ` Junio C Hamano
2018-02-24 13:58 ` Duy Nguyen
2018-02-09 11:01 ` [PATCH v3 07/42] completion: use __gitcomp_builtin in _git_apply Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 08/42] completion: use __gitcomp_builtin in _git_branch Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 09/42] completion: use __gitcomp_builtin in _git_checkout Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 10/42] completion: use __gitcomp_builtin in _git_cherry_pick Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 11/42] completion: use __gitcomp_builtin in _git_clean Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 12/42] completion: use __gitcomp_builtin in _git_clone Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 13/42] completion: use __gitcomp_builtin in _git_commit Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 14/42] completion: use __gitcomp_builtin in _git_config Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 15/42] completion: use __gitcomp_builtin in _git_describe Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 16/42] completion: use __gitcomp_builtin in _git_difftool Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 17/42] completion: use __gitcomp_builtin in _git_fetch Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 18/42] completion: use __gitcomp_builtin in _git_fsck Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 19/42] completion: use __gitcomp_builtin in _git_gc Nguyễn Thái Ngọc Duy
2018-02-09 11:01 ` [PATCH v3 20/42] completion: use __gitcomp_builtin in _git_grep Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 21/42] completion: use __gitcomp_builtin in _git_help Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 22/42] completion: use __gitcomp_builtin in _git_init Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 23/42] completion: use __gitcomp_builtin in _git_ls_files Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 24/42] completion: use __gitcomp_builtin in _git_ls_remote Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 25/42] completion: use __gitcomp_builtin in _git_merge Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 26/42] completion: use __gitcomp_builtin in _git_merge_base Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 27/42] completion: use __gitcomp_builtin in _git_mv Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 28/42] completion: use __gitcomp_builtin in _git_name_rev Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 29/42] completion: use __gitcomp_builtin in _git_notes Nguyễn Thái Ngọc Duy
2018-02-14 14:29 ` SZEDER Gábor
2018-02-23 10:33 ` Duy Nguyen
2018-02-23 10:59 ` Duy Nguyen
2018-02-14 15:15 ` SZEDER Gábor
2018-02-23 10:40 ` Duy Nguyen
2018-02-09 11:02 ` [PATCH v3 30/42] completion: use __gitcomp_builtin in _git_pull Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 31/42] completion: use __gitcomp_builtin in _git_push Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 32/42] completion: use __gitcomp_builtin in _git_remote Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 33/42] remote: force completing --mirror= instead of --mirror Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 34/42] completion: use __gitcomp_builtin in _git_replace Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 35/42] completion: use __gitcomp_builtin in _git_reset Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 36/42] completion: use __gitcomp_builtin in _git_revert Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 37/42] completion: use __gitcomp_builtin in _git_rm Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 38/42] completion: use __gitcomp_builtin in _git_show_branch Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 39/42] completion: use __gitcomp_builtin in _git_status Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 40/42] completion: use __gitcomp_builtin in _git_tag Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 41/42] completion: use __gitcomp_builtin in _git_worktree Nguyễn Thái Ngọc Duy
2018-02-09 11:02 ` [PATCH v3 42/42] git-completion.bash: add GIT_COMPLETION_OPTIONS=all config Nguyễn Thái Ngọc Duy
2018-02-09 14:19 ` Ævar Arnfjörð Bjarmason [this message]
2018-02-10 9:29 ` Duy Nguyen
2018-02-11 14:47 ` Ævar Arnfjörð Bjarmason
2018-02-11 1:59 ` Eric Sunshine
2018-02-12 0:34 ` Duy Nguyen
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=877ermmeia.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@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
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).