bash completion: show-branch color support

This implements completion of --color and --no-color for "git
show-branch" and color.showbranch for "git config".

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1a90cb87f58b9595c3399793c26791557c9704f9..b5883872628f8ffa3972e7a082d0a62c12037845 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1333,7 +1333,8 @@ _git_config ()
                __gitcomp "$(__git_merge_strategies)"
                return
                ;;
                __gitcomp "$(__git_merge_strategies)"
                return
                ;;

-       color.branch|color.diff|color.interactive|color.status|color.ui)
+       color.branch|color.diff|color.interactive|\
+       color.showbranch|color.status|color.ui)

                __gitcomp "always never auto"
                return
                ;;
                __gitcomp "always never auto"
                return
                ;;


@@ -1415,6 +1416,7 @@ _git_config ()
                color.interactive.help
                color.interactive.prompt
                color.pager
                color.interactive.help
                color.interactive.prompt
                color.pager

+               color.showbranch

                color.status
                color.status.added
                color.status.changed
                color.status
                color.status.added
                color.status.changed


@@ -1676,6 +1678,7 @@ _git_show_branch ()
                __gitcomp "
                        --all --remotes --topo-order --current --more=
                        --list --independent --merge-base --no-name
                __gitcomp "
                        --all --remotes --topo-order --current --more=
                        --list --independent --merge-base --no-name

+                       --color --no-color

                        --sha1-name --topics --reflog
                        "
                return
                        --sha1-name --topics --reflog
                        "
                return