completion: Use consistent if [...] convention, not "test"

The local coding convention in bash completion is to use [...] rather
than test. Additionally,

if [...]; then

is preferred over

if [...]
then

and so matching "if [...]\nthen" were changed accordingly.

Signed-off-by: Ted Pavlic <ted@tedpavlic.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 6bbe09ab9a58b50114664a44a0f47036a9280e6a..c61576fcafc7b3911f10995a62940c11149d83e8 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -84,39 +84,30 @@ __git_ps1 ()
        if [ -n "$g" ]; then
                local r
                local b
        if [ -n "$g" ]; then
                local r
                local b

-               if [ -d "$g/rebase-apply" ]
-               then
-                       if test -f "$g/rebase-apply/rebasing"
-                       then
+               if [ -d "$g/rebase-apply" ]; then
+                       if [ -f "$g/rebase-apply/rebasing" ]; then

                                r="|REBASE"
                                r="|REBASE"

-                       elif test -f "$g/rebase-apply/applying"
-                       then
+               elif [ -f "$g/rebase-apply/applying" ]; then

                                r="|AM"
                        else
                                r="|AM/REBASE"
                        fi
                        b="$(git symbolic-ref HEAD 2>/dev/null)"
                                r="|AM"
                        else
                                r="|AM/REBASE"
                        fi
                        b="$(git symbolic-ref HEAD 2>/dev/null)"

-               elif [ -f "$g/rebase-merge/interactive" ]
-               then
+               elif [ -f "$g/rebase-merge/interactive" ]; then

                        r="|REBASE-i"
                        b="$(cat "$g/rebase-merge/head-name")"
                        r="|REBASE-i"
                        b="$(cat "$g/rebase-merge/head-name")"

-               elif [ -d "$g/rebase-merge" ]
-               then
+               elif [ -d "$g/rebase-merge" ]; then

                        r="|REBASE-m"
                        b="$(cat "$g/rebase-merge/head-name")"
                        r="|REBASE-m"
                        b="$(cat "$g/rebase-merge/head-name")"

-               elif [ -f "$g/MERGE_HEAD" ]
-               then
+               elif [ -f "$g/MERGE_HEAD" ]; then

                        r="|MERGING"
                        b="$(git symbolic-ref HEAD 2>/dev/null)"
                else
                        r="|MERGING"
                        b="$(git symbolic-ref HEAD 2>/dev/null)"
                else

-                       if [ -f "$g/BISECT_LOG" ]
-                       then
+                       if [ -f "$g/BISECT_LOG" ]; then

                                r="|BISECTING"
                        fi
                                r="|BISECTING"
                        fi

-                       if ! b="$(git symbolic-ref HEAD 2>/dev/null)"
-                       then
-                               if ! b="$(git describe --exact-match HEAD 2>/dev/null)"
-                               then
+                       if ! b="$(git symbolic-ref HEAD 2>/dev/null)"; then
+                               if ! b="$(git describe --exact-match HEAD 2>/dev/null)"; then

                                        b="$(cut -c1-7 "$g/HEAD")..."
                                fi
                        fi
                                        b="$(cut -c1-7 "$g/HEAD")..."
                                fi
                        fi


@@ -125,8 +116,8 @@ __git_ps1 ()
                local w
                local i
 
                local w
                local i
 

-               if test -n "${GIT_PS1_SHOWDIRTYSTATE-}"; then
-                       if test "$(git config --bool bash.showDirtyState)" != "false"; then
+               if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then
+                       if [ "$(git config --bool bash.showDirtyState)" != "false" ]; then

                                git diff --no-ext-diff --ignore-submodules \
                                        --quiet --exit-code || w="*"
                                if git rev-parse --quiet --verify HEAD >/dev/null; then
                                git diff --no-ext-diff --ignore-submodules \
                                        --quiet --exit-code || w="*"
                                if git rev-parse --quiet --verify HEAD >/dev/null; then