zshrc: Show git and fossil branch at the same time
This commit is contained in:
parent
9ebbecb974
commit
73598ec4ba
1 changed files with 10 additions and 4 deletions
14
zshrc
14
zshrc
|
@ -99,11 +99,17 @@ set_prompt
|
||||||
__precmd() {
|
__precmd() {
|
||||||
__update_terminal_cwd
|
__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)
|
local git_branch=$(git symbolic-ref HEAD 2>/dev/null)
|
||||||
branch=${branch##refs/heads/}
|
git_branch=${git_branch##refs/heads/}
|
||||||
|
if [ -n "$git_branch" ]; then
|
||||||
|
branch="$branch${branch:+ }g:$git_branch"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set_prompt $branch
|
set_prompt $branch
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue