git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"SZEDER Gábor" <szeder.dev@gmail.com>,
	"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v2 04/26] completion: bash: do not modify COMP_WORDBREAKS
Date: Tue, 10 Nov 2020 15:21:14 -0600	[thread overview]
Message-ID: <20201110212136.870769-5-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20201110212136.870769-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 5b2dff150d..12275a3558 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -45,11 +45,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 e0fda27f4c..fa7f88bbb3 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -45,6 +45,7 @@ fi
 
 local old_complete="$functions[complete]"
 functions[complete]=:
+COMP_WORDBREAKS=':'
 GIT_SOURCING_ZSH_COMPLETION=y . "$script"
 functions[complete]="$old_complete"
 
-- 
2.29.2


  parent reply	other threads:[~2020-11-10 21:21 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-10 21:21 [PATCH v2 00/26] completion: bash: a bunch of fixes, cleanups, and reorganization Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 01/26] completion: bash: fix prefix detection in branch.* Felipe Contreras
2020-11-25  8:48   ` SZEDER Gábor
2020-11-25 20:37     ` Junio C Hamano
2020-11-25 21:46       ` Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 02/26] completion: bash: add correct suffix in variables Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 03/26] completion: bash: fix for suboptions with value Felipe Contreras
2020-11-10 21:21 ` Felipe Contreras [this message]
2020-11-10 21:21 ` [PATCH v2 05/26] test: completion: fix currently typed words Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 06/26] test: completion: add run_func() helper Felipe Contreras
2020-11-11  7:27   ` Junio C Hamano
2020-11-11 11:43     ` Felipe Contreras
2020-11-11 16:39       ` Junio C Hamano
2020-11-12 22:54         ` Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 07/26] completion: bash: remove non-append functionality Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 08/26] completion: bash: get rid of _append() functions Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 09/26] completion: bash: get rid of any non-append code Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 10/26] completion: bash: factor out check in __gitcomp Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 11/26] completion: bash: simplify equal suffix check Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 12/26] completion: bash: refactor __gitcomp Felipe Contreras
2020-11-12 19:58   ` Junio C Hamano
2020-11-12 22:00     ` Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 13/26] completion: bash: simplify __gitcomp Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 14/26] completion: bash: change suffix check in __gitcomp Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 15/26] completion: bash: improve __gitcomp suffix code Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 16/26] completion: bash: simplify config_variable_name Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 17/26] test: completion: switch __gitcomp_nl prefix test Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 18/26] completion: bash: simplify _get_comp_words_by_ref() Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 19/26] completion: bash: refactor _get_comp_words_by_ref() Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 20/26] completion: bash: cleanup _get_comp_words_by_ref() Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 21/26] completion: bash: trivial cleanup Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 22/26] completion: bash: rename _get_comp_words_by_ref() Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 23/26] completion: bash: improve __gitcomp description Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 24/26] completion: bash: add __gitcomp_opts Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 25/26] completion: bash: cleanup __gitcomp* invocations Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 26/26] completion: bash: shuffle __gitcomp functions 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

  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=20201110212136.870769-5-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
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).