123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429 |
- # Git version checking
- autoload -Uz is-at-least
- git_version="${${(As: :)$(git version 2>/dev/null)}[3]}"
- #
- # Functions Current
- # (sorted alphabetically by function name)
- # (order should follow README)
- #
- # The name of the current branch
- # Back-compatibility wrapper for when this function was defined here in
- # the plugin, before being pulled in to core lib/git.zsh as git_current_branch()
- # to fix the core -> git plugin dependency.
- function current_branch() {
- git_current_branch
- }
- # Check for develop and similarly named branches
- function git_develop_branch() {
- command git rev-parse --git-dir &>/dev/null || return
- local branch
- for branch in dev devel develop development; do
- if command git show-ref -q --verify refs/heads/$branch; then
- echo $branch
- return 0
- fi
- done
- echo develop
- return 1
- }
- # Check if main exists and use instead of master
- function git_main_branch() {
- command git rev-parse --git-dir &>/dev/null || return
- local ref
- for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default,stable,master}; do
- if command git show-ref -q --verify $ref; then
- echo ${ref:t}
- return 0
- fi
- done
- # If no main branch was found, fall back to master but return error
- echo master
- return 1
- }
- function grename() {
- if [[ -z "$1" || -z "$2" ]]; then
- echo "Usage: $0 old_branch new_branch"
- return 1
- fi
- # Rename branch locally
- git branch -m "$1" "$2"
- # Rename branch in origin remote
- if git push origin :"$1"; then
- git push --set-upstream origin "$2"
- fi
- }
- #
- # Functions Work in Progress (WIP)
- # (sorted alphabetically by function name)
- # (order should follow README)
- #
- # Similar to `gunwip` but recursive "Unwips" all recent `--wip--` commits not just the last one
- function gunwipall() {
- local _commit=$(git log --grep='--wip--' --invert-grep --max-count=1 --format=format:%H)
- # Check if a commit without "--wip--" was found and it's not the same as HEAD
- if [[ "$_commit" != "$(git rev-parse HEAD)" ]]; then
- git reset $_commit || return 1
- fi
- }
- # Warn if the current branch is a WIP
- function work_in_progress() {
- command git -c log.showSignature=false log -n 1 2>/dev/null | grep -q -- "--wip--" && echo "WIP!!"
- }
- #
- # Aliases
- # (sorted alphabetically by command)
- # (order should follow README)
- # (in some cases force the alisas order to match README, like for example gke and gk)
- #
- alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
- function ggpnp() {
- if [[ "$#" == 0 ]]; then
- ggl && ggp
- else
- ggl "${*}" && ggp "${*}"
- fi
- }
- compdef _git ggpnp=git-checkout
- alias ggpur='ggu'
- alias g='git'
- alias ga='git add'
- alias gaa='git add --all'
- alias gapa='git add --patch'
- alias gau='git add --update'
- alias gav='git add --verbose'
- alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"'
- alias gam='git am'
- alias gama='git am --abort'
- alias gamc='git am --continue'
- alias gamscp='git am --show-current-patch'
- alias gams='git am --skip'
- alias gap='git apply'
- alias gapt='git apply --3way'
- alias gbs='git bisect'
- alias gbsb='git bisect bad'
- alias gbsg='git bisect good'
- alias gbsn='git bisect new'
- alias gbso='git bisect old'
- alias gbsr='git bisect reset'
- alias gbss='git bisect start'
- alias gbl='git blame -w'
- alias gb='git branch'
- alias gba='git branch --all'
- alias gbd='git branch --delete'
- alias gbD='git branch --delete --force'
- function gbda() {
- git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch --delete 2>/dev/null
- }
- # Copied and modified from James Roeder (jmaroeder) under MIT License
- # https://github.com/jmaroeder/plugin-git/blob/216723ef4f9e8dde399661c39c80bdf73f4076c4/functions/gbda.fish
- function gbds() {
- local default_branch=$(git_main_branch)
- (( ! $? )) || default_branch=$(git_develop_branch)
- git for-each-ref refs/heads/ "--format=%(refname:short)" | \
- while read branch; do
- local merge_base=$(git merge-base $default_branch $branch)
- if [[ $(git cherry $default_branch $(git commit-tree $(git rev-parse $branch\^{tree}) -p $merge_base -m _)) = -* ]]; then
- git branch -D $branch
- fi
- done
- }
- alias gbgd='LANG=C git branch --no-color -vv | grep ": gone\]" | cut -c 3- | awk '"'"'{print $1}'"'"' | xargs git branch -d'
- alias gbgD='LANG=C git branch --no-color -vv | grep ": gone\]" | cut -c 3- | awk '"'"'{print $1}'"'"' | xargs git branch -D'
- alias gbm='git branch --move'
- alias gbnm='git branch --no-merged'
- alias gbr='git branch --remote'
- alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
- alias gbg='LANG=C git branch -vv | grep ": gone\]"'
- alias gco='git checkout'
- alias gcor='git checkout --recurse-submodules'
- alias gcb='git checkout -b'
- alias gcB='git checkout -B'
- alias gcd='git checkout $(git_develop_branch)'
- alias gcm='git checkout $(git_main_branch)'
- alias gcp='git cherry-pick'
- alias gcpa='git cherry-pick --abort'
- alias gcpc='git cherry-pick --continue'
- alias gclean='git clean --interactive -d'
- alias gcl='git clone --recurse-submodules'
- alias gclf='git clone --recursive --shallow-submodules --filter=blob:none --also-filter-submodules'
- function gccd() {
- setopt localoptions extendedglob
- # get repo URI from args based on valid formats: https://git-scm.com/docs/git-clone#URLS
- local repo="${${@[(r)(ssh://*|git://*|ftp(s)#://*|http(s)#://*|*@*)(.git/#)#]}:-$_}"
- # clone repository and exit if it fails
- command git clone --recurse-submodules "$@" || return
- # if last arg passed was a directory, that's where the repo was cloned
- # otherwise parse the repo URI and use the last part as the directory
- [[ -d "$_" ]] && cd "$_" || cd "${${repo:t}%.git/#}"
- }
- compdef _git gccd=git-clone
- alias gcam='git commit --all --message'
- alias gcas='git commit --all --signoff'
- alias gcasm='git commit --all --signoff --message'
- alias gcs='git commit --gpg-sign'
- alias gcss='git commit --gpg-sign --signoff'
- alias gcssm='git commit --gpg-sign --signoff --message'
- alias gcmsg='git commit --message'
- alias gcsm='git commit --signoff --message'
- alias gc='git commit --verbose'
- alias gca='git commit --verbose --all'
- alias gca!='git commit --verbose --all --amend'
- alias gcan!='git commit --verbose --all --no-edit --amend'
- alias gcans!='git commit --verbose --all --signoff --no-edit --amend'
- alias gcann!='git commit --verbose --all --date=now --no-edit --amend'
- alias gc!='git commit --verbose --amend'
- alias gcn='git commit --verbose --no-edit'
- alias gcn!='git commit --verbose --no-edit --amend'
- alias gcf='git config --list'
- alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
- alias gd='git diff'
- alias gdca='git diff --cached'
- alias gdcw='git diff --cached --word-diff'
- alias gds='git diff --staged'
- alias gdw='git diff --word-diff'
- function gdv() { git diff -w "$@" | view - }
- compdef _git gdv=git-diff
- alias gdup='git diff @{upstream}'
- function gdnolock() {
- git diff "$@" ":(exclude)package-lock.json" ":(exclude)*.lock"
- }
- compdef _git gdnolock=git-diff
- alias gdt='git diff-tree --no-commit-id --name-only -r'
- alias gf='git fetch'
- # --jobs=<n> 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'
- alias gfo='git fetch origin'
- alias gg='git gui citool'
- alias gga='git gui citool --amend'
- alias ghh='git help'
- alias glgg='git log --graph'
- alias glgga='git log --graph --decorate --all'
- alias glgm='git log --graph --max-count=10'
- alias glods='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset" --date=short'
- alias glod='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset"'
- alias glola='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --all'
- alias glols='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --stat'
- alias glol='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset"'
- alias glo='git log --oneline --decorate'
- alias glog='git log --oneline --decorate --graph'
- alias gloga='git log --oneline --decorate --graph --all'
- # Pretty log messages
- function _git_log_prettily(){
- if ! [ -z $1 ]; then
- git log --pretty=$1
- fi
- }
- compdef _git _git_log_prettily=git-log
- alias glp='_git_log_prettily'
- alias glg='git log --stat'
- alias glgp='git log --stat --patch'
- alias gignored='git ls-files -v | grep "^[[:lower:]]"'
- alias gfg='git ls-files | grep'
- alias gm='git merge'
- alias gma='git merge --abort'
- alias gmc='git merge --continue'
- alias gms="git merge --squash"
- alias gmff="git merge --ff-only"
- alias gmom='git merge origin/$(git_main_branch)'
- alias gmum='git merge upstream/$(git_main_branch)'
- alias gmtl='git mergetool --no-prompt'
- alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
- alias gl='git pull'
- alias gpr='git pull --rebase'
- alias gprv='git pull --rebase -v'
- alias gpra='git pull --rebase --autostash'
- alias gprav='git pull --rebase --autostash -v'
- function ggu() {
- [[ "$#" != 1 ]] && local b="$(git_current_branch)"
- git pull --rebase origin "${b:=$1}"
- }
- compdef _git ggu=git-checkout
- alias gprom='git pull --rebase origin $(git_main_branch)'
- alias gpromi='git pull --rebase=interactive origin $(git_main_branch)'
- alias gprum='git pull --rebase upstream $(git_main_branch)'
- alias gprumi='git pull --rebase=interactive upstream $(git_main_branch)'
- alias ggpull='git pull origin "$(git_current_branch)"'
- function ggl() {
- if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
- git pull origin "${*}"
- else
- [[ "$#" == 0 ]] && local b="$(git_current_branch)"
- git pull origin "${b:=$1}"
- fi
- }
- compdef _git ggl=git-checkout
- alias gluc='git pull upstream $(git_current_branch)'
- alias glum='git pull upstream $(git_main_branch)'
- alias gp='git push'
- alias gpd='git push --dry-run'
- function ggf() {
- [[ "$#" != 1 ]] && local b="$(git_current_branch)"
- git push --force origin "${b:=$1}"
- }
- compdef _git ggf=git-checkout
- alias gpf!='git push --force'
- is-at-least 2.30 "$git_version" \
- && alias gpf='git push --force-with-lease --force-if-includes' \
- || alias gpf='git push --force-with-lease'
- function ggfl() {
- [[ "$#" != 1 ]] && local b="$(git_current_branch)"
- git push --force-with-lease origin "${b:=$1}"
- }
- compdef _git ggfl=git-checkout
- alias gpsup='git push --set-upstream origin $(git_current_branch)'
- is-at-least 2.30 "$git_version" \
- && alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes' \
- || alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease'
- alias gpv='git push --verbose'
- alias gpoat='git push origin --all && git push origin --tags'
- alias gpod='git push origin --delete'
- alias ggpush='git push origin "$(git_current_branch)"'
- function ggp() {
- if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
- git push origin "${*}"
- else
- [[ "$#" == 0 ]] && local b="$(git_current_branch)"
- git push origin "${b:=$1}"
- fi
- }
- compdef _git ggp=git-checkout
- alias gpu='git push upstream'
- alias grb='git rebase'
- alias grba='git rebase --abort'
- alias grbc='git rebase --continue'
- alias grbi='git rebase --interactive'
- alias grbo='git rebase --onto'
- alias grbs='git rebase --skip'
- alias grbd='git rebase $(git_develop_branch)'
- alias grbm='git rebase $(git_main_branch)'
- alias grbom='git rebase origin/$(git_main_branch)'
- alias grbum='git rebase upstream/$(git_main_branch)'
- alias grf='git reflog'
- alias gr='git remote'
- alias grv='git remote --verbose'
- alias gra='git remote add'
- alias grrm='git remote remove'
- alias grmv='git remote rename'
- alias grset='git remote set-url'
- alias grup='git remote update'
- alias grh='git reset'
- alias gru='git reset --'
- alias grhh='git reset --hard'
- alias grhk='git reset --keep'
- alias grhs='git reset --soft'
- alias gpristine='git reset --hard && git clean --force -dfx'
- alias gwipe='git reset --hard && git clean --force -df'
- alias groh='git reset origin/$(git_current_branch) --hard'
- alias grs='git restore'
- alias grss='git restore --source'
- alias grst='git restore --staged'
- alias gunwip='git rev-list --max-count=1 --format="%s" HEAD | grep -q "\--wip--" && git reset HEAD~1'
- alias grev='git revert'
- alias greva='git revert --abort'
- alias grevc='git revert --continue'
- alias grm='git rm'
- alias grmc='git rm --cached'
- alias gcount='git shortlog --summary --numbered'
- alias gsh='git show'
- alias gsps='git show --pretty=short --show-signature'
- alias gstall='git stash --all'
- alias gstaa='git stash apply'
- alias gstc='git stash clear'
- alias gstd='git stash drop'
- alias gstl='git stash list'
- alias gstp='git stash pop'
- # use the default stash push on git 2.13 and newer
- is-at-least 2.13 "$git_version" \
- && alias gsta='git stash push' \
- || alias gsta='git stash save'
- alias gsts='git stash show --patch'
- alias gst='git status'
- alias gss='git status --short'
- alias gsb='git status --short --branch'
- alias gsi='git submodule init'
- alias gsu='git submodule update'
- alias gsd='git svn dcommit'
- alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
- alias gsr='git svn rebase'
- alias gsw='git switch'
- alias gswc='git switch --create'
- alias gswd='git switch $(git_develop_branch)'
- alias gswm='git switch $(git_main_branch)'
- alias gta='git tag --annotate'
- alias gts='git tag --sign'
- alias gtv='git tag | sort -V'
- alias gignore='git update-index --assume-unchanged'
- alias gunignore='git update-index --no-assume-unchanged'
- alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
- alias gwt='git worktree'
- alias gwta='git worktree add'
- alias gwtls='git worktree list'
- alias gwtmv='git worktree move'
- alias gwtrm='git worktree remove'
- alias gstu='gsta --include-untracked'
- alias gtl='gtl(){ git tag --sort=-v:refname -n --list "${1}*" }; noglob gtl'
- alias gk='\gitk --all --branches &!'
- alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h) &!'
- unset git_version
- # Logic for adding warnings on deprecated aliases
- local old_alias new_alias
- for old_alias new_alias (
- # TODO(2023-10-19): remove deprecated `git pull --rebase` aliases
- gup gpr
- gupv gprv
- gupa gpra
- gupav gprav
- gupom gprom
- gupomi gpromi
- ); do
- aliases[$old_alias]="
- print -Pu2 \"%F{yellow}[oh-my-zsh] '%F{red}${old_alias}%F{yellow}' is a deprecated alias, using '%F{green}${new_alias}%F{yellow}' instead.%f\"
- $new_alias"
- done
- unset old_alias new_alias
|