bash completion with 2.18.0/maint: unknown options

Hello,

in /git/git I have v2.18.0 and in ~/.bashrc : export PS1='${debian_chroot:+($debian_chroot)}\[\e[01;32m\]\u@\h\[\e[00m\]:\[\ e[ 01;34m\]\w\[\e[36m\]$(__git_ps1 " %s")\$ \[\e[0m\]' source /git/git/contrib/completion/git-completion.bash source /git/git/contrib/completion/git-prompt.sh

After upgrading to 2.18 the completion does not work:

typing "git de<TAB>" prints
my@host:~$ git deUnknown option: --list-cmds=list-
mainporcelain,others,nohelpers,alias,list-complete,config
usage: git [--version] [--help] [-C <path>] [-c name=value]
           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-
path]
           [-p | --paginate | --no-pager] [--no-replace-objects] [
--bare]
           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
           <command> [<args>]
l.txt

with l.txt being part of a file called "del.txt"

or typing "git reb<TAB>" I expect to have rebase, but I see
my@myhost:~$ git rebUnknown option: --list-cmds=list-
mainporcelain,others,nohelpers,alias,list-complete,config
usage: git [--version] [--help] [-C <path>] [-c name=value]
           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-
path]
           [-p | --paginate | --no-pager] [--no-replace-objects] [
--bare]
           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
           <command> [<args>]

Ideas?

Doing in git/git/ "git checkout v2.17." followed by 'source /git/git/contrib/completion/git-comletion.bash" does help (makes the completion functioning).

In the likely case this is fixed by now on master, please backport the fix soon to the maint branch.

Greetings
  Дилят