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>

Ramkumar Ramachandra committed Jan 5, 2014 at 15:48 UTC 422553df49bee5a5ea3c9106dfb7f1e4cbb54153
1 file changed +1
contrib/completion/git-completion.bash
+1
@@ -1841,6 +1841,7 @@ _git_config ()
1841 branch.*)
1842 local pfx="${cur%.*}." cur_="${cur#*.}"
1843 __gitcomp_nl "$(__git_heads)" "$pfx" "$cur_" "."
1844 + __gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
1845 return
1846 ;;
1847 guitool.*.*)