[PATCH] bash: remove always true if statement from __git_ps1()
- From
SZEDER Gábor <szeder@ira.uka.de>
- Date
- May 29, 2009, 12:00 UTC
- Message-ID
- <1243598436-2207-1-git-send-email-szeder@ira.uka.de>
- In-Reply-To
- <1243527441-3394-1-git-send-email-szeder@ira.uka.de>
The recent commits 8763dbb1 (completion: fix PS1 display during a merge on detached HEAD, 2009-05-16), ff790b6a (completion: simplify "current branch" in __git_ps1(), 2009-05-10), and d7107ca6 (completion: fix PS1 display during an AM on detached HEAD, 2009-05-26) ensure that the branch name in __git_ps1() is always set to something sensible. Therefore, the condition for checking the non-empty branch name is always fulfilled, and can be removed.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> ---
The patch is the same, but the commit message is different, because Junio's d7107ca6 has fixed the issue.
contrib/completion/git-completion.bash | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0c8bb53..6c78c94 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -152,12 +152,10 @@ __git_ps1 () fi fi - if [ -n "$b" ]; then - if [ -n "${1-}" ]; then - printf "$1" "$c${b##refs/heads/}$w$i$r" - else - printf " (%s)" "$c${b##refs/heads/}$w$i$r" - fi + if [ -n "${1-}" ]; then + printf "$1" "$c${b##refs/heads/}$w$i$r" + else + printf " (%s)" "$c${b##refs/heads/}$w$i$r" fi fi }
-- 1.6.3.1.189.g9321