Merge branch 'proposed' of git://github.com/gustavh/stgit

[stgit] / contrib / stgbashprompt.sh

diff --git a/contrib/stgbashprompt.sh b/contrib/stgbashprompt.sh
index 16bb39b..d5c4994 100755 (executable)
--- 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