Merge branch 'ma/bash-completion-leaking-x' into maint

gitster · gitster · commit 89ba311df399 · 2015-04-27T12:23:51.000-07:00
The completion script (in contrib/) contaminated global namespace
and clobbered on a shell variable $x.

* ma/bash-completion-leaking-x:
  completion: fix global bash variable leak on __gitcompappend
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -186,7 +186,7 @@ fi
 
 __gitcompappend ()
 {
-	local i=${#COMPREPLY[@]}
+	local x i=${#COMPREPLY[@]}
 	for x in $1; do
 		if [[ "$x" == "$3"* ]]; then
 			COMPREPLY[i++]="$2$x$4"

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ fi`
`186`	`186`
`187`	`187`	`__gitcompappend ()`
`188`	`188`	`{`
`189`		`- local i=${#COMPREPLY[@]}`
	`189`	`+ local x i=${#COMPREPLY[@]}`
`190`	`190`	`for x in $1; do`
`191`	`191`	`if [[ "$x" == "$3"* ]]; then`
`192`	`192`	`COMPREPLY[i++]="$2$x$4"`