From 1eddc79a9008b360a11fb049de508cf20682fea6 Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Mon, 25 Jun 2012 15:19:47 -0700 Subject: [PATCH] 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. --- share/functions/__fish_git_prompt.fish | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish index 2c84cad91..dd1f17ea4 100644 --- a/share/functions/__fish_git_prompt.fish +++ b/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