From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Sun, 5 Jan 2014 10:18:04 +0000 (+0530)
Subject: completion: fix branch.autosetup(merge|rebase)
X-Git-Tag: v1.9-rc0~21^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/422553df49bee5a5ea3c9106dfb7f1e4cbb54153

completion: fix branch.autosetup(merge|rebase)

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 'autosetupmerge', 'autosetuprebase' as candidates for
completion too, using __gitcomp_nl_append ().

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 20febffd9d..a57bcbe403 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1841,6 +1841,7 @@ _git_config ()
 	branch.*)
 		local pfx="${cur%.*}." cur_="${cur#*.}"
 		__gitcomp_nl "$(__git_heads)" "$pfx" "$cur_" "."
+		__gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
 		return
 		;;
 	guitool.*.*)