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: Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 44/45] completion: bash: trivial cleanup
Date: Fri, 18 Jun 2021 13:25:17 -0500	[thread overview]
Message-ID: <20210618182518.697912-45-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210618182518.697912-1-felipe.contreras@gmail.com>

The most typical case first (COMP_WORDBREAKS contains our wanted words).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 0433713242..cef064795d 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -355,9 +355,7 @@ _get_comp_words_by_ref ()
 	# Which word separators to exclude?
 	exclude="${COMP_WORDBREAKS//[^=:]}"
 	cword=$COMP_CWORD
-	if [ -z "$exclude" ]; then
-		words=("${COMP_WORDS[@]}")
-	else
+	if [ -n "$exclude" ]; then
 		# List of word completion separators has shrunk;
 		# re-assemble words to complete.
 		for ((i=0, j=0; i < ${#COMP_WORDS[@]}; i++, j++)); do
@@ -392,6 +390,8 @@ _get_comp_words_by_ref ()
 				cword=$j
 			fi
 		done
+	else
+		words=("${COMP_WORDS[@]}")
 	fi
 
 	cur=${words[cword]}
-- 
2.32.0


  parent reply	other threads:[~2021-06-18 18:27 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 ` [PATCH v2 08/45] completion: bash: do not modify COMP_WORDBREAKS Felipe Contreras
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 ` Felipe Contreras [this message]
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

  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=20210618182518.697912-45-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.
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).