Ramkumar Ramachandra <artag...@gmail.com> writes:

> A typical prompt looks like:
>
>     artagnon|master *=:~/src/git$
>                    ^
>                    why do we have this space?
>
> Nobody has branch names that end with +, *, =, < or > anyway, so it
> doesn't serve the purpose of disambiguation.
>
> Make this separator configurable via GIT_PS1_STATESEPARATOR.  This means
> that you can set it to "" and get this prompt:
>
>     artagnon|master*=:~/src/git$
>
> Signed-off-by: Ramkumar Ramachandra <artag...@gmail.com>
> ---
>  contrib/completion/git-prompt.sh | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/contrib/completion/git-prompt.sh 
> b/contrib/completion/git-prompt.sh
> index eaf5c36..5d8b745 100644
> --- a/contrib/completion/git-prompt.sh
> +++ b/contrib/completion/git-prompt.sh
> @@ -359,6 +359,11 @@ __git_ps1 ()
>                       fi
>               fi
>  
> +             local z=" "
> +             if [ -n "${GIT_PS1_STATESEPARATOR+set}" ]; then
> +                     z="${GIT_PS1_STATESEPARATOR}"
> +             fi

It is simpler to use 'default values', no?

        local z=${GIT_PS1_STATESEPARATOR-" "}

> @@ -384,7 +389,7 @@ __git_ps1 ()
>                               
> gitstring="\[$branch_color\]$branchstring\[$c_clear\]"
>  
>                               if [ -n "$w$i$s$u$r$p" ]; then
> -                                     gitstring="$gitstring "
> +                                     gitstring="$gitstring$z"

Perhaps not even a nit, but you do not have to concatenate when $z
is set to empty, so it may be worth doing

    if [ -n "$w$i$s$u$r$p" ] && [ -n "$z" ]; then
        gitstring="$gitstring$z"
    fi

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to