[PATCH 1/2] git-prompt.sh: strip unnecessary space in prompt string
From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:57:13
Subsystem:
the rest · Maintainer:
Linus Torvalds
Nobody has branch names that end with + or *. Then why put a space
after the branch name and before [*|+][=|<|>] in the prompt string?
Before this, your prompt might have looked like:
artagnon|master *=:~/src/git$
Now, it will look like:
artagnon|master*=:~/src/git$
Signed-off-by: Ramkumar Ramachandra <redacted>
---
contrib/completion/git-prompt.sh | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index eaf5c36..08c9b22 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh@@ -383,9 +383,6 @@ __git_ps1 () # is necessary to prevent wrapping issues! gitstring="\[$branch_color\]$branchstring\[$c_clear\]" - if [ -n "$w$i$s$u$r$p" ]; then - gitstring="$gitstring " - fi if [ "$w" = "*" ]; then gitstring="$gitstring\[$bad_color\]$w" fi
@@ -400,13 +397,13 @@ __git_ps1 () fi gitstring="$gitstring\[$c_clear\]$r$p" else - gitstring="$c${b##refs/heads/}${f:+ $f}$r$p" + gitstring="$c${b##refs/heads/}${f:+$f}$r$p" fi gitstring=$(printf -- "$printf_format" "$gitstring") PS1="$ps1pc_start$gitstring$ps1pc_end" else # NO color option unless in PROMPT_COMMAND mode - printf -- "$printf_format" "$c${b##refs/heads/}${f:+ $f}$r$p" + printf -- "$printf_format" "$c${b##refs/heads/}${f:+$f}$r$p" fi fi }
--
1.8.3.rc1.52.g4537cf1