[StGit PATCH 0/2] Bash prompt updates

Here is a fix to update the bash prompt so it does not
use the obsolete current file anymore.

Part 2 is my version which uses a different format, mostly
because '/' can be part of the branch name.

-- robin