From 6e158ec6cbe4332641fd7d785054f6506e45ea4d Mon Sep 17 00:00:00 2001 From: Daniel Metzler Date: Tue, 15 Apr 2025 17:10:52 +0200 Subject: [PATCH] Added new --prune-tags to git fetch alias --- plugins/git/README.md | 2 +- plugins/git/git.plugin.zsh | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/plugins/git/README.md b/plugins/git/README.md index bcadc4713..4a788583b 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -90,7 +90,7 @@ plugins=(... git) | `gdnolock` | `git diff $@ ":(exclude)package-lock.json" ":(exclude)\*.lock"` | | `gdt` | `git diff-tree --no-commit-id --name-only -r` | | `gf` | `git fetch` | -| `gfa` | `git fetch --all --tags --prune` | +| `gfa` | `git fetch --all --tags --prune --prune-tags --jobs=10` | | `gfo` | `git fetch origin` | | `gg` | `git gui citool` | | `gga` | `git gui citool --amend` | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index f34c0726b..b0287ec00 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -219,10 +219,17 @@ compdef _git gdnolock=git-diff alias gdt='git diff-tree --no-commit-id --name-only -r' alias gf='git fetch' + +# --prune-tags was added in git 2.17 # --jobs= was added in git 2.8 -is-at-least 2.8 "$git_version" \ - && alias gfa='git fetch --all --tags --prune --jobs=10' \ - || alias gfa='git fetch --all --tags --prune' +if is-at-least 2.17 "$git_version"; then + alias gfa='git fetch --all --tags --prune --prune-tags --jobs=10' +elif is-at-least 2.8 "$git_version"; then + alias gfa='git fetch --all --tags --prune --jobs=10' +else + alias gfa='git fetch --all --tags --prune' +fi + alias gfo='git fetch origin' alias gg='git gui citool' alias gga='git gui citool --amend'