diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2012-02-02 11:48:08 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-02-06 15:53:33 -0800 |
| commit | 583e4d579d36894ccdc1f4fb4a6dd24c9274c5f8 (patch) | |
| tree | 559617acca04f9659d8c9b63ba969d225c45d447 | |
| parent | completion: use ls -1 instead of rolling a loop to do that ourselves (diff) | |
| download | tgif-583e4d579d36894ccdc1f4fb4a6dd24c9274c5f8.tar.xz | |
completion: simplify __gitcomp and __gitcomp_nl implementations
These shell functions are written in an unnecessarily verbose way;
simplify their "conditionally use $<number> after checking $# against
<number>" logic by using shell's built-in conditional substitution
facilities.
Also remove the first of the two assignments to IFS in __gitcomp_nl
that does not have any effect.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | contrib/completion/git-completion.bash | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ec6eed673a..6c8dc8f1a3 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -495,11 +495,8 @@ fi # 4: A suffix to be appended to each possible completion word (optional). __gitcomp () { - local cur_="$cur" + local cur_="${3-$cur}" - if [ $# -gt 2 ]; then - cur_="$3" - fi case "$cur_" in --*=) COMPREPLY=() @@ -524,18 +521,8 @@ __gitcomp () # appended. __gitcomp_nl () { - local s=$'\n' IFS=' '$'\t'$'\n' - local cur_="$cur" suffix=" " - - if [ $# -gt 2 ]; then - cur_="$3" - if [ $# -gt 3 ]; then - suffix="$4" - fi - fi - - IFS=$s - COMPREPLY=($(compgen -P "${2-}" -S "$suffix" -W "$1" -- "$cur_")) + local IFS=$'\n' + COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}")) } __git_heads () |