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>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ec6eed673ae3837755aaede7b2ee5aa9dfedc16d..6c8dc8f1a3fc9bfc0d9d904723da9e7dd321a80d 100755 (executable)
--- 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 ()
 {
 # 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=()
        case "$cur_" in
        --*=)
                COMPREPLY=()


@@ -524,18 +521,8 @@ __gitcomp ()
 #    appended.
 __gitcomp_nl ()
 {
 #    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 ()
 }
 
 __git_heads ()