X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/330c6aff37039f746215d9e293a282dc87e7f080..0b9ea6b8c230e531546ae67c797bc486605e2e54:/contrib/stgbashprompt.sh diff --git a/contrib/stgbashprompt.sh b/contrib/stgbashprompt.sh index f4817a1..d5c4994 100755 --- a/contrib/stgbashprompt.sh +++ b/contrib/stgbashprompt.sh @@ -5,12 +5,12 @@ if [ "$PS1" ]; then function __prompt_git() { local git_dir ref br top; - git_dir=$(git-rev-parse --git-dir 2> /dev/null) || return - ref=$(git-symbolic-ref HEAD 2> /dev/null) || return + git_dir=$(git rev-parse --git-dir 2> /dev/null) || return + ref=$(git symbolic-ref HEAD 2> /dev/null) || return br=${ref#refs/heads/} top=$(tail -n 1 $git_dir/patches/$br/applied 2>/dev/null) \ - && top="/$top"; - echo "[$br$top]" + top=${top:-(none)} + echo "[$top@$br]" } PS1='\u@\h:$(__prompt_git)\W\$ ' fi