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

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
git-mirror · Apr 20, 2015 · 6b1258b · 6b1258b
2 parents 1eb0545 + 852ff1c
commit 6b1258b
Showing 1 changed file with 1 addition and 1 deletion.
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"