Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlock

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index fbe597232c11c05c1b8f9c366232d52f050b8d51..5944c824abe9aa4dee8b63b0e91a047125722b22 100644 (file)
--- 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"