diff options
Diffstat (limited to 'plugins/git/git.plugin.zsh')
| -rw-r--r-- | plugins/git/git.plugin.zsh | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 5a9ccff5c..e32136f15 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -1,3 +1,7 @@ +# Git version checking +autoload -Uz is-at-least +git_version="${${(As: :)$(git version 2>/dev/null)}[3]}" + # # Functions # @@ -27,11 +31,15 @@ function work_in_progress() { # Check if main exists and use instead of master function git_main_branch() { - if [[ -n "$(git branch --list main)" ]]; then - echo main - else - echo master - fi + command git rev-parse --git-dir &>/dev/null || return + local branch + for branch in main trunk; do + if command git show-ref -q --verify refs/heads/$branch; then + echo $branch + return + fi + done + echo master } # @@ -104,7 +112,10 @@ function gdv() { git diff -w "$@" | view - } compdef _git gdv=git-diff alias gf='git fetch' -alias gfa='git fetch --all --prune' +# --jobs=<n> was added in git 2.8 +is-at-least 2.8 "$git_version" \ + && alias gfa='git fetch --all --prune --jobs=10' \ + || alias gfa='git fetch --all --prune' alias gfo='git fetch origin' alias gfg='git ls-files | grep' @@ -240,8 +251,7 @@ alias gss='git status -s' alias gst='git status' # use the default stash push on git 2.13 and newer -autoload -Uz is-at-least -is-at-least 2.13 "$(git --version 2>/dev/null | awk '{print $3}')" \ +is-at-least 2.13 "$git_version" \ && alias gsta='git stash push' \ || alias gsta='git stash save' @@ -291,3 +301,5 @@ function grename() { git push --set-upstream origin "$2" fi } + +unset git_version |