From: Ramkumar Ramachandra Date: Mon, 30 Dec 2013 14:52:17 GMT Subject: [PATCH 3/4] completion: fix branch.autosetup(merge|rebase) Message-ID: <1388415138-11011-4-git-send-email-artagnon@gmail.com> In-Reply-To: <1388415138-11011-1-git-send-email-artagnon@gmail.com> When attempting to complete $ git config branch.auto 'autosetupmerge' and 'autosetuprebase' don't come up. This is because "$cur" is matched with "branch.*" and a list of branches are completed. Add 'autosetup(merge|rebase)' to the list of branches using __gitcomp_2 (). Also take care to not complete $ git config branch.autosetupmerge. $ git config branch.autosetuprebase. with the usual branch.. candidates. Signed-off-by: Ramkumar Ramachandra --- contrib/completion/git-completion.bash | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 64b20b8..0bda757 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1851,12 +1851,18 @@ _git_config () ;; branch.*.*) local pfx="${cur%.*}." cur_="${cur##*.}" + if [ "$pfx" == "branch.autosetupmerge." ] || + [ "$pfx" == "branch.autosetuprebase." ]; then + return + fi __gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_" return ;; branch.*) local pfx="${cur%.*}." cur_="${cur#*.}" - __gitcomp_nl "$(__git_heads)" "$pfx" "$cur_" "." + __gitcomp_2 "$(__git_heads)" " + autosetupmerge autosetuprebase + " "$pfx" "$cur_" "." return ;; guitool.*.*) -- 1.8.5.2.227.g53f3478