diff --git a/zshrc b/zshrc index 36a9f6a..83900e8 100644 --- a/zshrc +++ b/zshrc @@ -99,11 +99,17 @@ set_prompt __precmd() { __update_terminal_cwd - local branch=$(fossil branch current 2>/dev/null) + local branch="" + local fossil_branch=$(fossil branch current 2>/dev/null) + if [ -n "$fossil_branch" ]; then + branch="$branch${branch:+ }f:$fossil_branch" + fi - if [ -z "$branch" ]; then - branch=$(git symbolic-ref HEAD 2>/dev/null) - branch=${branch##refs/heads/} + + local git_branch=$(git symbolic-ref HEAD 2>/dev/null) + git_branch=${git_branch##refs/heads/} + if [ -n "$git_branch" ]; then + branch="$branch${branch:+ }g:$git_branch" fi set_prompt $branch