From ba94d8601c1d71582aea2e64a6986b4245a4ba94 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 18 Jul 2024 07:57:48 +0200 Subject: bash-git-prompt: better branch parsing for branches containing "/" --- bash-git-prompt.in | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/bash-git-prompt.in b/bash-git-prompt.in index 14640b9..e67d6dd 100755 --- a/bash-git-prompt.in +++ b/bash-git-prompt.in @@ -40,7 +40,17 @@ fi if ! ${skip} && status=$(git status --porcelain 2> /dev/null) then [ -n "${PS1}" ] && PS1="$PS1 " - branch="$((git symbolic-ref HEAD 2> /dev/null || git describe --always) | sed "s|^.*/||")" + branch=$( + ( + git symbolic-ref HEAD 2> /dev/null \ + || git describe --always + ) \ + | sed ' + s|^refs/heads/|| + t + s|^.*/|| + ' + ) gitDir="$(git rev-parse --show-toplevel)/$(git rev-parse --git-dir)" if [ -e ${gitDir}/rebase-merge ] || [ -e ${gitDir}/rebase-apply ] then -- cgit v1.2.3-70-g09d2