git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v1 40/43] completion: bash: cleanup _get_comp_words_by_ref()

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Apr 26, 2021, 16:14 UTC
Message-ID
<20210426161458.49860-41-felipe.contreras@gmail.com>
In-Reply-To
<20210426161458.49860-1-felipe.contreras@gmail.com>
Remove temporary variables.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 05b6762210..4b01de38a9 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -350,14 +350,13 @@ __git_dequote ()
 if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
 _get_comp_words_by_ref ()
 {
-	local words_ cword_
 	local exclude i j first
 
 	# Which word separators to exclude?
 	exclude="${COMP_WORDBREAKS//[^=:]}"
-	cword_=$COMP_CWORD
+	cword=$COMP_CWORD
 	if [ -z "$exclude" ]; then
-		words_=("${COMP_WORDS[@]}")
+		words=("${COMP_WORDS[@]}")
 	else
 		# List of word completion separators has shrunk;
 		# re-assemble words to complete.
@@ -377,9 +376,9 @@ _get_comp_words_by_ref ()
 					((j--))
 				fi
 				first=
-				words_[$j]=${words_[j]}${COMP_WORDS[i]}
+				words[$j]=${words[j]}${COMP_WORDS[i]}
 				if [ $i = $COMP_CWORD ]; then
-					cword_=$j
+					cword=$j
 				fi
 				if (($i < ${#COMP_WORDS[@]} - 1)); then
 					((i++))
@@ -388,17 +387,15 @@ _get_comp_words_by_ref ()
 					break 2
 				fi
 			done
-			words_[$j]=${words_[j]}${COMP_WORDS[i]}
+			words[$j]=${words[j]}${COMP_WORDS[i]}
 			if [ $i = $COMP_CWORD ]; then
-				cword_=$j
+				cword=$j
 			fi
 		done
 	fi
 
-	cword=$cword_
-	cur=${words_[cword]}
-	prev=${words_[cword-1]}
-	words=("${words_[@]}")
+	cur=${words[cword]}
+	prev=${words[cword-1]}
 }
 fi
 
-- 
2.31.0
Previous: Felipe ContrerasNext: Felipe Contreras
Message 41 of 46 in “completion: git-completion 1.3.1 patches”
  1. 00/43 completion: git-completion 1.3.1 patchesFelipe Contreras, Apr 26, 2021
  2. 01/43 completion: bash: fix prefix detection in branch.*Felipe Contreras, Apr 26, 2021
  3. 02/43 completion: fix for suboptions with valueFelipe Contreras, Apr 26, 2021
  4. 03/43 completion: bash: fix for multiple dash commandsFelipe Contreras, Apr 26, 2021
  5. 04/43 completion: bash: add correct suffix in variablesFelipe Contreras, Apr 26, 2021
  6. 05/43 completion: bash: do not modify COMP_WORDBREAKSFelipe Contreras, Apr 26, 2021
  7. 06/43 test: completion: fix currently typed wordsFelipe Contreras, Apr 26, 2021
  8. 07/43 test: completion: switch __gitcomp_nl prefix testFelipe Contreras, Apr 26, 2021
  9. 08/43 test: completion: add run_func() helperFelipe Contreras, Apr 26, 2021
  10. 09/43 completion: bash: remove non-append functionalityFelipe Contreras, Apr 26, 2021
  11. 10/43 completion: bash: get rid of _append() functionsFelipe Contreras, Apr 26, 2021
  12. 11/43 completion: bash: get rid of any non-append codeFelipe Contreras, Apr 26, 2021
  13. 12/43 completion: zsh: fix options with argumentsFelipe Contreras, Apr 26, 2021
  14. 13/43 completion: zsh: expand --git-dir file argumentFelipe Contreras, Apr 26, 2021
  15. 14/43 completion: zsh: add support for general -C optsFelipe Contreras, Apr 26, 2021
  16. 15/43 completion: zsh: fix for undefined completionsFelipe Contreras, Apr 26, 2021
  17. 16/43 completion: zsh: add support for general -c optsFelipe Contreras, Apr 26, 2021
  18. 17/43 completion: zsh: fix extra space on foo=Felipe Contreras, Apr 26, 2021
  19. 18/43 completion: zsh: add excluded optionsFelipe Contreras, Apr 26, 2021
  20. 19/43 completion: zsh: always set compsetFelipe Contreras, Apr 26, 2021
  21. 20/43 completion: factor out check in __gitcompFelipe Contreras, Apr 26, 2021
  22. 21/43 completion: simplify equal suffix checkFelipe Contreras, Apr 26, 2021
  23. 22/43 completion: refactor __gitcompFelipe Contreras, Apr 26, 2021
  24. 23/43 completion: simplify __gitcompFelipe Contreras, Apr 26, 2021
  25. 24/43 completion: bash: change suffix check in __gitcompFelipe Contreras, Apr 26, 2021
  26. 25/43 completion: improve __gitcomp suffix codeFelipe Contreras, Apr 26, 2021
  27. 26/43 completion: bash: simplify config_variable_nameFelipe Contreras, Apr 26, 2021
  28. 27/43 test: completion: add missing testFelipe Contreras, Apr 26, 2021
  29. 28/43 completion: bash: improve __gitcomp descriptionFelipe Contreras, Apr 26, 2021
  30. 29/43 completion: add __gitcomp_optsFelipe Contreras, Apr 26, 2021
  31. 30/43 completion: bash: cleanup __gitcomp* invocationsFelipe Contreras, Apr 26, 2021
  32. 31/43 completion: bash: shuffle __gitcomp functionsFelipe Contreras, Apr 26, 2021
  33. 32/43 completion: zsh: simplify __gitcomp_directFelipe Contreras, Apr 26, 2021
  34. 33/43 completion: zsh: shuffle __gitcomp* functionsFelipe Contreras, Apr 26, 2021
  35. 34/43 completion: zsh: fix direct quotingFelipe Contreras, Apr 26, 2021
  36. 35/43 completion: zsh: add elements individually in __gitcomp_optsFelipe Contreras, Apr 26, 2021
  37. 36/43 completion: zsh: add __gitcompadd helperFelipe Contreras, Apr 26, 2021
  38. 37/43 completion: zsh: add correct removable suffixFelipe Contreras, Apr 26, 2021
  39. 38/43 completion: bash: simplify _get_comp_words_by_ref()Felipe Contreras, Apr 26, 2021
  40. 39/43 completion: bash: refactor _get_comp_words_by_ref()Felipe Contreras, Apr 26, 2021
  41. 40/43 completion: bash: cleanup _get_comp_words_by_ref()Felipe Contreras, Apr 26, 2021
  42. 41/43 completion: bash: trivial cleanupFelipe Contreras, Apr 26, 2021
  43. 42/43 completion: bash: rename _get_comp_words_by_ref()Felipe Contreras, Apr 26, 2021
  44. 43/43 completion: zsh: add higher-priority locationFelipe Contreras, Apr 26, 2021
  45. Junio C HamanoMay 6, 2021
  46. Felipe ContrerasMay 7, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.