diff options
| author |  Aaron Gyes <me@aaron.gy> | 2016-04-08 10:46:51 +0800 |
|---|---|---|
| committer |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2016-04-08 10:49:29 +0800 |
| commit | 36691df6fe4667645b71b550ce5eea90762ac23a (patch) | |
| tree | ec2d420e797298da5fd83e4ee514f9643b231835 /share/functions/__fish_git_prompt.fish | |
| parent | 790c7f80c7d0fa1c97380885201eb50a2abcce02 (diff) | |
Stringify many completions and functions, with --invert stringification.
I believe apm must have been buggy - example output that I found online
showed `tr` was mangling paths with spaces in it. Should be fixed.
Also, use dscl on OS X in __fish_complete_users.fish like
__fish_print_users.fish already does.
Diffstat (limited to 'share/functions/__fish_git_prompt.fish')
| -rw-r--r-- | share/functions/__fish_git_prompt.fish | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish index 4fb2f16c..128a3f97 100644 --- a/share/functions/__fish_git_prompt.fish +++ b/share/functions/__fish_git_prompt.fish @@ -286,8 +286,8 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi set -l os set -l commits (command git rev-list --left-right $upstream...HEAD ^/dev/null; set os $status) if test $os -eq 0 - set -l behind (count (for arg in $commits; echo $arg; end | grep '^<')) - set -l ahead (count (for arg in $commits; echo $arg; end | grep -v '^<')) + set -l behind (count (for arg in $commits; echo $arg; end | string match -r '^<')) + set -l ahead (count (for arg in $commits; echo $arg; end | string match -r -v '^<')) set count "$behind $ahead" else set count |