Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

git_prompt: Add branch information for rebase

Browse source
This commit is contained in:
Brian Gernhardt 2013-07-02 11:16:11 -04:00
parent 5753fa2106
commit d5c1bf98d7
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
share/functions/__fish_git_prompt.fish
View file

@ -390,8 +390,10 @@ function __fish_git_prompt_operation_branch_bare --description "__fish_git_promp
if test -f $git_dir/rebase-merge/interactive if test -f $git_dir/rebase-merge/interactive
set operation "|REBASE-i" set operation "|REBASE-i"
set branch (cat $git_dir/rebase-merge/head-name ^/dev/null)
else if test -d $git_dir/rebase-merge else if test -d $git_dir/rebase-merge
set operation "|REBASE-m" set operation "|REBASE-m"
set branch (cat $git_dir/rebase-merge/head-name ^/dev/null)
else else
if test -d $git_dir/rebase-apply if test -d $git_dir/rebase-apply
if test -f $git_dir/rebase-apply/rebasing if test -f $git_dir/rebase-apply/rebasing
@ -410,25 +412,28 @@ function __fish_git_prompt_operation_branch_bare --description "__fish_git_promp
end end
end end
set branch (git symbolic-ref HEAD ^/dev/null; set os $status) if test -z "$branch"
if test $os -ne 0 set branch (git symbolic-ref HEAD ^/dev/null; set os $status)
set branch (switch "$__fish_git_prompt_describe_style"
case contains
git describe --contains HEAD
case branch
git describe --contains --all HEAD
case describe
git describe HEAD
case default '*'
git describe --tags --exact-match HEAD
end ^/dev/null; set os $status)
if test $os -ne 0 if test $os -ne 0
set branch (cut -c1-7 $git_dir/HEAD ^/dev/null; set os $status) set detached yes
set branch (switch "$__fish_git_prompt_describe_style"
case contains
git describe --contains HEAD
case branch
git describe --contains --all HEAD
case describe
git describe HEAD
case default '*'
git describe --tags --exact-match HEAD
end ^/dev/null; set os $status)
if test $os -ne 0 if test $os -ne 0
set branch unknown set branch (cut -c1-7 $git_dir/HEAD ^/dev/null; set os $status)
if test $os -ne 0
set branch unknown
end
end end
set branch "($branch)"
end end
set branch "($branch)"
end end
if test "true" = (git rev-parse --is-inside-git-dir ^/dev/null) if test "true" = (git rev-parse --is-inside-git-dir ^/dev/null)