Merge branch 'nd/git-dir-pointing-at-gitfile' into maint
[gitweb.git] / contrib / completion / git-completion.bash
index cd509a5d63922e05d5c2f5239a8acdd7baab3047..e1b73130723a57e7f641236331699e67bb0d4d82 100644 (file)
@@ -1958,7 +1958,6 @@ _git_config ()
                core.fileMode
                core.fsyncobjectfiles
                core.gitProxy
-               core.ignoreCygwinFSTricks
                core.ignoreStat
                core.ignorecase
                core.logAllRefUpdates
@@ -2581,7 +2580,7 @@ if [[ -n ${ZSH_VERSION-} ]]; then
                                --*=*|*.) ;;
                                *) c="$c " ;;
                                esac
-                               array+=("$c")
+                               array[${#array[@]}+1]="$c"
                        done
                        compset -P '*[=:]'
                        compadd -Q -S '' -p "${2-}" -a -- array && _ret=0