Roman Fietze <roman.fietze@xxxxxxxxxxxxx> writes:
> Hello Shawn, hello git list members,
>
> Wouldn't it improve the readability of the bash prompt, if there would
> be a space between the branch name and the status flags (dirty, stash,
> untracked)?
Perhaps.
> Signed-off-by: Roman Fietze <roman.fietze@xxxxxxxxxxxxx>
> ---
> contrib/completion/git-completion.bash | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-
> completion.bash
> index bd66639..407176b 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -169,10 +169,12 @@ __git_ps1 ()
> fi
> fi
>
> + local f="$w$i$s$u$r"
I think this line and the two changes to printf below is a big improvement
(unless we are using f for something else---I didn't look). But I think
the next line is wrong.
> + f=${f:+ $f}
The $r string is designed to be used as suffix from the beginning and
always has "|" in front of it as a delimiter, so if there is no w/i/s/u
(and I suspect many people do not use GIT_PS1_SHOWDIRTYSTATE and friends,
and these are _always_ empty for them) the above will begin with "|".
There is no need to steal one column from a typeable width from the
command line in such a case.
> if [ -n "${1-}" ]; then
> - printf "$1" "$c${b##refs/heads/}$w$i$s$u$r"
> + printf "$1" "$c${b##refs/heads/}$f"
> else
> - printf " (%s)" "$c${b##refs/heads/}$w$i$s$u$r"
> + printf " (%s)" "$c${b##refs/heads/}$f"
> fi
> fi
> }
To implement your stated goal (dirty/stash/untracked), you probably want
to do this instead...
local f="$w$i$s$u"
f="${f:+ $f}$r"
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html