completion: add new __gitcompadd helper
The idea is to never touch the COMPREPLY variable directly. This allows other completion systems (i.e. zsh) to override __gitcompadd, and do something different instead. Also, this allows further optimizations down the line. There should be no functional changes. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Apr 10, 2013 at 01:57 UTC
1ce23aad3446c8a423cd4ec4de1b91361cdf4a85
1 file changed
+8
-5
contrib/completion/git-completion.bash
+8
-5
@@ -195,6 +195,11 @@ _get_comp_words_by_ref ()
195
}
196
fi
197
198
+__gitcompadd ()
199
+{
200
+ COMPREPLY=($(compgen -W "$1" -P "$2" -S "$4" -- "$3"))
201
+}
202
+
203
# Generates completion reply with compgen, appending a space to possible
204
# completion words, if necessary.
205
# It accepts 1 to 4 arguments:
@@ -211,9 +216,7 @@ __gitcomp ()
216
;;
217
*)
218
local IFS=$'\n'
214
- COMPREPLY=($(compgen -P "${2-}" \
215
- -W "$(__gitcomp_1 "${1-}" "${4-}")" \
216
- -- "$cur_"))
219
+ __gitcompadd "$(__gitcomp_1 "${1-}" "${4-}")" "${2-}" "$cur_" ""
220
;;
221
esac
222
}
@@ -230,7 +233,7 @@ __gitcomp ()
233
__gitcomp_nl ()
234
{
235
local IFS=$'\n'
233
- COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
236
+ __gitcompadd "$1" "${2-}" "${3-$cur}" "${4- }"
237
}
238
239
# Generates completion reply with compgen from newline-separated possible
@@ -1825,7 +1828,7 @@ _git_config ()
1828
local remote="${prev#remote.}"
1829
remote="${remote%.fetch}"
1830
if [ -z "$cur" ]; then
1828
- COMPREPLY=("refs/heads/")
1831
+ __gitcompadd "refs/heads/" "" "" ""
1832
return
1833
fi
1834
__gitcomp_nl "$(__git_refs_remotes "$remote")"