2020-06-03 10:26:15 +00:00
# Tools
2020-10-07 19:46:34 +00:00
alias g="git"
2020-03-08 19:18:49 +00:00
2021-06-04 11:43:56 +00:00
y() {
2021-06-05 18:28:35 +00:00
unignore="$XDG_CONFIG_HOME/yadm/unignore"
test -r "$unignore" && cat "$unignore" | envsubst | yadm add --intent-to-add --pathspec-from-file=-
2021-06-04 11:43:56 +00:00
test "$#" -eq 0 && yadm s || yadm "$@"
}
2020-11-26 19:38:26 +00:00
yc() {
echo "config/$1:" >/tmp/yc-msg
yadm commit -v --template /tmp/yc-msg ${@:2} -- "$XDG_CONFIG_HOME/$1"
}
2021-06-06 16:37:36 +00:00
alias sy="sysyadm"
alias sysyadm="sudo yadm -Y /etc/yadm"
alias sysinit="sysyadm init -w /; sysyadm config include.path '$XDG_CONFIG_HOME/git/config'"
2021-05-02 17:37:18 +00:00
gcn() {
if test $# -eq 0 || test -e $1
then
fulldir="$(realpath ${1:-$PWD})"
dir="${fulldir#$DATA/*/}"
else
dir="notes/$1"
fulldir="$DATA/2-standards/$dir"
fi
echo "$dir:" >/tmp/gcn-msg
git commit -v --template /tmp/gcn-msg ${@:2} -- $fulldir
}
2020-06-26 21:25:53 +00:00
# if in home or under XDG_CONFIG_HOME and not within a git directory, replace git by yadm
2020-06-08 09:42:34 +00:00
git() {
2020-10-08 09:11:51 +00:00
case "$1" in
2020-11-14 01:05:51 +00:00
reset) test "$2" = "--hard" && return 1;;
2020-10-08 09:11:51 +00:00
config) ;;
clone) ;;
*) case "$PWD" in
$HOME|$XDG_CONFIG_HOME|$LAST_YADM)
yadm "$@"
return
;;
2021-03-23 20:55:02 +00:00
$XDG_CONFIG_HOME*|$HOME/.local*)
2020-10-08 09:11:51 +00:00
if ! command git rev-parse --show-toplevel &>/dev/null; then
export LAST_YADM="$PWD"
yadm "$@"
return
fi;;
esac;;
esac
command git "$@";
2020-06-08 09:42:34 +00:00
}
2020-11-13 11:49:24 +00:00
# BRANCHES
2020-06-03 10:26:15 +00:00
# Remove list of tags local & remote
2020-03-08 19:18:49 +00:00
gitrmtag() {
2020-10-08 09:11:51 +00:00
declare -a refs
local index=1
for tag in $@; do refs[index++]=":refs/tags/$tag"; done
git push origin "${refs[@]}" && git tag -d "$@"
2020-03-08 19:18:49 +00:00
}
2020-06-03 10:26:15 +00:00
# Rename a tag
2020-03-08 19:18:49 +00:00
gitretag() {
2020-10-08 09:11:51 +00:00
git push origin refs/tags/${1}:refs/tags/${2} :refs/tags/$1 && git tag -d $1
2020-03-08 19:18:49 +00:00
}
2020-06-03 10:26:15 +00:00
# Repo management {{{
2020-03-08 19:18:49 +00:00
gitinit() {
2020-11-12 08:56:29 +00:00
git init -b main
2020-10-08 09:11:51 +00:00
git add .
git commit -m "First strike"
gitorigin "$@"
git push
2020-03-08 19:18:49 +00:00
}
gitbackup() {
2020-10-08 09:11:51 +00:00
p=$(basename $PWD)
builtin cd ..
git clone --mirror $p
cd $p
2020-03-08 19:18:49 +00:00
}
project() {
2020-10-08 09:11:51 +00:00
cd $projects_dir
if [ -d $2 ]
then cd "$2" && gitorigin "$@"
else gitclone "$@"
fi
2020-03-08 19:18:49 +00:00
}
2020-06-03 10:26:15 +00:00
gitremote() {
2020-10-08 09:11:51 +00:00
case "$1" in
http*) echo "git@$(echo "$1" | cut -d'/' -f3):$(echo "$1" | cut -d'/' -f4)/$(echo "$1" | cut -d'/' -f5)" ;;
git:*) echo "$1" ;;
*) test "$3" = "cau" && 3="CAU-Kiel-Tech-Inf"
test "$3" = "btl" && 3="betweenthelinesev"
2021-05-06 06:29:05 +00:00
echo "git@${1:-github.com}:${3:-$(git config user.name)}/${2:-$(basename $PWD)}.git" ;;
2020-10-08 09:11:51 +00:00
esac
2020-06-03 10:26:15 +00:00
}
gitclone() {
2020-10-08 09:11:51 +00:00
remote=$(gitremote "$@")
echo $remote
2020-12-07 20:55:25 +00:00
git clone $remote ${@:4} || return $?
2021-01-27 10:29:00 +00:00
cd "$(test $4 && echo $4 || basename ${remote%.git})"
2020-03-08 19:18:49 +00:00
}
gitfork() {
2020-10-08 09:11:51 +00:00
builtin cd "$projects_dir/_forks"
2020-11-26 19:38:26 +00:00
gitclone github.com "$1" "" "$3" --recurse-submodules || return $?
2020-11-22 18:55:59 +00:00
test "$2" && git remote add upstream "$(gitremote github.com "$1" "$2")"
2020-10-08 09:11:51 +00:00
git remote -v
2020-03-08 19:18:49 +00:00
}
2020-06-03 10:26:15 +00:00
# set repo as origin and set all branches upstream to their respective remote branch, if available
2020-03-08 19:18:49 +00:00
gitorigin() {
2020-10-08 09:11:51 +00:00
git remote remove origin 2>/dev/null
git remote add origin $(gitremote "$@")
git remote -v && git fetch || ( last=$? && echo "git fetch failed, aborting\!" && return $last )
2020-03-08 19:18:49 +00:00
2020-10-08 09:11:51 +00:00
git branch | sed 's/ //g' | sed 's/*//' | while read branch
do test $(git branch -a | grep origin/$branch | wc -l) -gt 0 && git branch -u origin/$branch $branch
done
2020-03-08 19:18:49 +00:00
}
2020-06-26 21:25:53 +00:00
# set repo as upstream or add a new remote
2020-03-08 19:18:49 +00:00
gitupstream() {
2020-12-23 12:41:45 +00:00
if test "$3"
2020-11-22 18:55:59 +00:00
then
2020-12-23 12:41:45 +00:00
local name="$3"
git remote remove "$3" 2>/dev/null
2020-11-22 18:55:59 +00:00
else
git remote get-url upstream 2>/dev/null && local name="$1" || local name="upstream"
2020-10-08 09:11:51 +00:00
fi
local origin="$(git remote get-url origin)"
2020-12-23 12:41:45 +00:00
git remote add -f $name "$(echo $origin | cut -d':' -f1):$1/${2:-$(echo $origin | cut -d'/' -f2)}"
2020-10-08 09:11:51 +00:00
git remote -v
2020-03-08 19:18:49 +00:00
}
2020-06-03 10:26:15 +00:00
# }}}
2020-03-08 19:18:49 +00:00
2020-06-03 10:26:15 +00:00
# Rewriting history {{{
2020-03-08 19:18:49 +00:00
# gets the AuthorDate of a given committish
git-authordate() {
2020-10-08 09:11:51 +00:00
local date=$(git log --pretty=fuller --date=raw -1 $1 | grep AuthorDate)
echo ${date##*: }
2020-03-08 19:18:49 +00:00
}
# executes a git command (usually commit) with the date of a given committish
git-withdate() {
2020-10-08 09:11:51 +00:00
date=$(git-authordate $1)
GIT_AUTHOR_DATE="$date" GIT_COMMITTER_DATE="$date" git "${@:2}"
2020-03-08 19:18:49 +00:00
}
# takes all changes in the current working tree and amends them to the given commit
gitedit() {
2020-10-08 09:11:51 +00:00
git stash
gitcommits -q $1
2021-01-03 14:01:11 +00:00
git reset --keep $1
git stash pop
2020-10-08 09:11:51 +00:00
git-withdate $1 commit --all --amend "${@:2}"
gitcommits
2020-03-08 19:18:49 +00:00
}
# takes two committishs and squashes them with all commits between them into a single commit
# this will rewrite the full history from then on, but should not create any conflicts
gitsquash() {
2020-10-08 09:11:51 +00:00
local -a options
while [ $# -gt 0 ]; do
case $1 in
-i) ignore=true; shift 1;;
-f|--force) force=true; shift 1;;
-*) options+=($1); exit 1;;
*) break;;
esac
done
((#!=2)) && echo "Usage: [options] <startcommit> <endcommit>" && return 1
[[ -n $(git status -s) ]] && [ ! $force ] && echo -e "Tree is dirty, commit or stash your changes first!\nIf you want to execute the command regardless, run again with --force" && return 1
1=$(git rev-parse $1)
2=$(git rev-parse $2)
[ $(git rev-list $1 --count) -lt $(git rev-list $2 --count) ] && t=$1 && 1=$2 && 2=$t
gitcommits -q $1
git reset --hard $1
if [ $(git rev-list $2 --count) = 1 ]; then
git update-ref -d HEAD
git add .
git-withdate $1 commit -c $1
else
git reset -q $2
git add .
git commit --amend
fi
gitcommits
2020-03-08 19:18:49 +00:00
}
# given a committish, this command saves a list of commits between the HEAD and the given committish into the .git directory
# when ran without parameters it applies the saved list of commits onto the current HEAD
gitcommits() {
2020-10-08 09:11:51 +00:00
verbosity=1
while [[ $# -gt 0 ]]; do
case $1 in
-v) verbosity=2; shift 1;;
-q|--quiet) verbosity=0; shift 1;;
--theirs) params=(-X theirs); shift 1;;
*) break;;
esac
done
stashed="$(git rev-parse --show-toplevel)/.git/stashed-commits"
if [ $1 ]; then
if [ $verbosity -eq 0 ]
then git rev-list --reverse HEAD...$1 >$stashed
else git rev-list --reverse HEAD...$1 | tee $stashed
fi
else
local aborted
for commit in $(cat $stashed); do
[ $aborted ] && rest+=($commit) && continue
[ $verbosity -gt 0 ] && git --no-pager log --oneline -1 $commit
git-withdate $commit cherry-pick $commit ${params:0} >/dev/null
last=$?
[ $last -gt 0 ] && aborted=true && typeset -a rest && continue
[ $verbosity -gt 0 ] && echo -e "\e[1A$(git log --color=always --pretty=format:"%C(yellow)$(git rev-parse --short HEAD^^)%C(bold) -> %Creset%C(yellow)%h%Creset %s" -1)"
[ $verbosity -gt 1 ] && git status -s
done
echo $rest >$stashed
[ $aborted ] && echo "A problem was encountered. Fix it and run 'gitcommits' again to apply the remaining ${#rest} commits."
fi
2020-03-08 19:18:49 +00:00
}
2020-06-03 10:26:15 +00:00
# }}}
# Testing
2021-02-16 12:08:56 +00:00
gittestcommit() { touch file$((++i)) && git add 'file*' && git commit -m "Create file$i"; }