X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/2f5e43aab8d29b746a8e21597a5032eb77be1612..58f09cf20b44f502fc56d56383461b71b7ae42fd:/contrib/stgbashprompt.sh diff --git a/contrib/stgbashprompt.sh b/contrib/stgbashprompt.sh index 16bb39b..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=$(cat $git_dir/patches/$br/current 2>/dev/null) \ - && top="/$top" - echo "[$br$top]" + top=$(tail -n 1 $git_dir/patches/$br/applied 2>/dev/null) \ + top=${top:-(none)} + echo "[$top@$br]" } PS1='\u@\h:$(__prompt_git)\W\$ ' fi