diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2019-04-09 18:29:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 18:29:18 +0200 |
| commit | 1bd72f588cb2e4950ea513aa4315ce77c792e43b (patch) | |
| tree | b1f8cf8b97e74d615b1eb7469ae968c7e38f3c38 | |
| parent | 308b046875f745abb87b3ef9f0382029fe37b452 (diff) | |
| download | zsh-1bd72f588cb2e4950ea513aa4315ce77c792e43b.tar.gz zsh-1bd72f588cb2e4950ea513aa4315ce77c792e43b.tar.bz2 zsh-1bd72f588cb2e4950ea513aa4315ce77c792e43b.zip | |
Update to inline conditional syntax
| -rw-r--r-- | plugins/git/git.plugin.zsh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 17e4d4b9d..fa2487a2c 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -33,11 +33,6 @@ function work_in_progress() { fi } -function _omz_git_stash_command() { - [[ `git --version 2>/dev/null` =~ '^git version ([[:digit:]]+.[[:digit:]]+)' && "$match[1]" >= '2.13' ]] \ - && echo push || echo save -} - # # Aliases # (sorted alphabetically) @@ -243,7 +238,12 @@ alias gsps='git show --pretty=short --show-signature' alias gsr='git svn rebase' alias gss='git status -s' alias gst='git status' -alias gsta="git stash $(_omz_git_stash_command)" + +# use the default stash push on git 2.13 and newer +[[ "$(git --version 2>/dev/null)" =~ '^git version ([0-9]+.[0-9]+)' && "$match" -ge '2.13' ]] \ + && alias gsta='git stash push' + || alias gsta='git stash save' + alias gstaa='git stash apply' alias gstc='git stash clear' alias gstd='git stash drop' |