2024-07-20 14:26:01 +01:00
|
|
|
# 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 gaa='git add --all'
|
|
|
|
alias gb='git branch'
|
|
|
|
alias gbd='git branch --delete'
|
|
|
|
|
|
|
|
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 gcb='git checkout -b'
|
|
|
|
alias gcm='git checkout $(git_main_branch)'
|
|
|
|
alias gcl='git clone --recurse-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 gd='git 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 gf='git fetch'
|
|
|
|
alias glol='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset"'
|
|
|
|
|
|
|
|
# Pretty log messages
|
|
|
|
function _git_log_prettily(){
|
|
|
|
if ! [ -z $1 ]; then
|
|
|
|
git log --pretty=$1
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
compdef _git _git_log_prettily=git-log
|
|
|
|
|
|
|
|
alias gm='git merge'
|
|
|
|
alias gma='git merge --abort'
|
|
|
|
|
|
|
|
alias gl='git pull'
|
|
|
|
|
|
|
|
function ggu() {
|
|
|
|
[[ "$#" != 1 ]] && local b="$(git_current_branch)"
|
|
|
|
git pull --rebase origin "${b:=$1}"
|
|
|
|
}
|
|
|
|
compdef _git ggu=git-checkout
|
|
|
|
|
|
|
|
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 gp='git push'
|
|
|
|
|
|
|
|
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 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 gra='git remote add'
|
|
|
|
alias grhh='git reset --hard'
|
|
|
|
alias gpristine='git reset --hard && git clean --force -dfx'
|
|
|
|
alias grm='git rm'
|
|
|
|
alias gsps='git show --pretty=short --show-signature'
|
|
|
|
alias gst='git status'
|
|
|
|
alias gsw='git switch'
|
2024-07-31 14:25:01 +01:00
|
|
|
|
|
|
|
function gcpr(){
|
|
|
|
git fetch -fu upstream refs/pull/$1/head:pr/$1
|
|
|
|
git checkout pr/$1
|
|
|
|
}
|
2024-07-20 14:26:01 +01:00
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|