Permalink
Browse files

Remove __fish_git_prompt's switch bug workaround

With the switch bug fixed, __fish_git_prompt can be very slightly
simplified by not recording the exit status of every case in the
describe style switch individually.
  • Loading branch information...
1 parent ccfc909 commit 1eddc79a9008b360a11fb049de508cf20682fea6 @kballard committed Jun 25, 2012
Showing with 5 additions and 5 deletions.
  1. +5 −5 share/functions/__fish_git_prompt.fish
@@ -237,14 +237,14 @@ function __fish_git_prompt --description "Prompt function for Git"
if test $os -ne 0
set b (switch "$__fish_git_prompt_describe_style"
case contains
- git describe --contains HEAD; set os $status
+ git describe --contains HEAD
case branch
- git describe --contains --all HEAD; set os $status
+ git describe --contains --all HEAD
case describe
- git describe HEAD; set os $status
+ git describe HEAD
case default '*'
- git describe --tags --exact-match HEAD; set os $status
- end ^/dev/null)
+ git describe --tags --exact-match HEAD
+ end ^/dev/null; set os $status)
if test $os -ne 0
set b (cut -c1-7 $git_dir/HEAD ^/dev/null; set os $status)
if test $os -ne 0

0 comments on commit 1eddc79

Please sign in to comment.