Merge branch 'vs/completion-with-set-u'

gitster · gitster · commit 5980e0d44258 · 2021-04-30T13:50:27.000+09:00
Effort to make the command line completion (in contrib/) safe with
"set -u" continues.

* vs/completion-with-set-u:
  completion: avoid aliased command lookup error in nounset mode
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1129,7 +1129,7 @@ __git_pretty_aliases ()
 # __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
-	local cur=$1 last list word cmdline
+	local cur=$1 last list= word cmdline
 
 	while [[ -n "$cur" ]]; do
 		if [[ "$list" == *" $cur "* ]]; then

Original file line number	Diff line number	Diff line change
`@@ -1129,7 +1129,7 @@ __git_pretty_aliases ()`
`1129`	`1129`	`# __git_aliased_command requires 1 argument`
`1130`	`1130`	`__git_aliased_command ()`
`1131`	`1131`	`{`
`1132`		`- local cur=$1 last list word cmdline`
	`1132`	`+ local cur=$1 last list= word cmdline`
`1133`	`1133`
`1134`	`1134`	`while [[ -n "$cur" ]]; do`
`1135`	`1135`	`if [[ "$list" == " $cur " ]]; then`