All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 08/45] completion: bash: do not modify COMP_WORDBREAKS
Date: Fri, 18 Jun 2021 13:24:41 -0500	[thread overview]
Message-ID: <20210618182518.697912-9-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210618182518.697912-1-felipe.contreras@gmail.com>

There was no need for this once __git_reassemble_comp_words_by_ref() was
introduced. Now irrespective of the value of COMP_WORDBREAKS, words are
always joined together.

By default COMP_WORDBREAKS does contain a colon, and if it doesn't
somebody probably has a reason for it.

Completions are not supposed to modify COMP_WORDBREAKS and none of the
completions in the bash-completion project do.

We manually set it in Zsh so the Bash script is not confused.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash | 5 -----
 contrib/completion/git-completion.zsh  | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 943995689f..bede8a7e2a 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -54,11 +54,6 @@
 #     When set to "1" suggest all options, including options which are
 #     typically hidden (e.g. '--allow-empty' for 'git commit').
 
-case "$COMP_WORDBREAKS" in
-*:*) : great ;;
-*)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
-esac
-
 # Discovers the path to the git repository taking any '--git-dir=<path>' and
 # '-C <path>' options into account and stores it in the $__git_repo_path
 # variable.
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 9f0e03e86b..5ddd2d6771 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -46,6 +46,7 @@ fi
 
 local old_complete="$functions[complete]"
 functions[complete]=:
+COMP_WORDBREAKS=':'
 GIT_SOURCING_ZSH_COMPLETION=y . "$script"
 functions[complete]="$old_complete"
 
-- 
2.32.0


  parent reply	other threads:[~2021-06-18 18:25 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-18 18:24 [PATCH v2 00/45] completion: git-completion 1.3.3 patches Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 01/45] completion: fix __git_cmd_idx regression Felipe Contreras
2021-06-18 18:58   ` [PATCH] " Felipe Contreras
2021-06-18 19:04   ` [PATCH v2 01/45] " Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 02/45] completion: bash: fix prefix detection in branch.* Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 03/45] completion: fix for suboptions with value Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 04/45] completion: bash: fix for multiple dash commands Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 05/45] completion: bash: add correct suffix in variables Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 06/45] completion: zsh: add higher-priority location Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 07/45] completion: zsh: trivial improvement Felipe Contreras
2021-06-18 18:24 ` Felipe Contreras [this message]
2021-06-18 18:24 ` [PATCH v2 09/45] test: completion: fix currently typed words Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 10/45] test: completion: switch __gitcomp_nl prefix test Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 11/45] test: completion: add run_func() helper Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 12/45] completion: bash: remove non-append functionality Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 13/45] completion: bash: get rid of _append() functions Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 14/45] completion: bash: get rid of any non-append code Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 15/45] completion: zsh: fix options with arguments Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 16/45] completion: zsh: expand --git-dir file argument Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 17/45] completion: zsh: add support for general -C opts Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 18/45] completion: zsh: fix for undefined completions Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 19/45] completion: zsh: add support for general -c opts Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 20/45] completion: zsh: fix extra space on foo= Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 21/45] completion: zsh: add excluded options Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 22/45] completion: zsh: always set compset Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 23/45] completion: factor out check in __gitcomp Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 24/45] completion: simplify equal suffix check Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 25/45] completion: refactor __gitcomp Felipe Contreras
2021-06-18 18:24 ` [PATCH v2 26/45] completion: simplify __gitcomp Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 27/45] completion: bash: change suffix check in __gitcomp Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 28/45] completion: improve __gitcomp suffix code Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 29/45] completion: bash: simplify config_variable_name Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 30/45] test: completion: add missing test Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 31/45] completion: bash: improve __gitcomp description Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 32/45] completion: add __gitcomp_opts Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 33/45] completion: bash: cleanup __gitcomp* invocations Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 34/45] completion: bash: shuffle __gitcomp functions Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 35/45] completion: zsh: simplify __gitcomp_direct Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 36/45] completion: zsh: shuffle __gitcomp* functions Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 37/45] completion: zsh: fix direct quoting Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 38/45] completion: zsh: add elements individually in __gitcomp_opts Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 39/45] completion: zsh: add __gitcompadd helper Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 40/45] completion: zsh: add correct removable suffix Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 41/45] completion: bash: simplify _get_comp_words_by_ref() Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 42/45] completion: bash: refactor _get_comp_words_by_ref() Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 43/45] completion: bash: cleanup _get_comp_words_by_ref() Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 44/45] completion: bash: trivial cleanup Felipe Contreras
2021-06-18 18:25 ` [PATCH v2 45/45] completion: bash: rename _get_comp_words_by_ref() Felipe Contreras

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=20210618182518.697912-9-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.