[PATCH v2 3/4] completion: fix branch.autosetup(merge|rebase)
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Jan 3, 2014, 08:00 UTC
- Message-ID
- <1388736031-6068-4-git-send-email-artagnon@gmail.com>
- In-Reply-To
- <1388736031-6068-1-git-send-email-artagnon@gmail.com>
When attempting to complete
$ git config branch.auto<TAB>
'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 ().
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> --- contrib/completion/git-completion.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 64b20b8..cbb4eca 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1856,7 +1856,9 @@ _git_config () ;; 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