janek
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config/shell/git: localize all variables in functions

This commit is contained in:
xeruf 2021-11-24 20:16:31 +01:00
parent 643be31eef
commit 489ffa7ec4
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.config/shell/git
View File

@ -2,18 +2,18 @@
alias g="git" alias g="git"
y() { y() {
unignore="$XDG_CONFIG_HOME/yadm/unignore" local unignore="$XDG_CONFIG_HOME/yadm/unignore"
test -r "$unignore" && cat "$unignore" | while read f; do eval ls -d $f; done | yadm add --intent-to-add --pathspec-from-file=- test -r "$unignore" && cat "$unignore" | while read f; do eval ls -d $f; done | yadm add --intent-to-add --pathspec-from-file=-
test "$#" -eq 0 && yadm s || yadm "$@" test "$#" -eq 0 && yadm s || yadm "$@"
} }
yc() { yc() {
folder=${1:-${PWD/$XDG_CONFIG_HOME\/}} local folder="${1:-${PWD/$XDG_CONFIG_HOME\/}}"
echo "config/$folder:" >/tmp/yc-msg echo "config/$folder:" >/tmp/yc-msg
yadm commit -v --template /tmp/yc-msg ${@:2} -- "$XDG_CONFIG_HOME/$folder" yadm commit -v --template /tmp/yc-msg ${@:2} -- "$XDG_CONFIG_HOME/$folder"*
} }
gcn() { gcn() {
root="$(git rev-parse --show-toplevel)" local root="$(git rev-parse --show-toplevel)"
if test "$root" = "$DATA" if test "$root" = "$DATA"
then then
if test $# -eq 0 || test -e "$1" if test $# -eq 0 || test -e "$1"
@ -78,7 +78,7 @@ git-authordate() {
} }
# executes a git command (usually commit) with the date of a given committish # executes a git command (usually commit) with the date of a given committish
git-withdate() { git-withdate() {
date=$(git-authordate $1) local date=$(git-authordate $1)
GIT_AUTHOR_DATE="$date" GIT_COMMITTER_DATE="$date" git "${@:2}" GIT_AUTHOR_DATE="$date" GIT_COMMITTER_DATE="$date" git "${@:2}"
} }
@ -98,8 +98,8 @@ gitsquash() {
local -a options local -a options
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case $1 in case $1 in
-i) ignore=true; shift 1;; -i) local ignore=true; shift 1;;
-f|--force) force=true; shift 1;; -f|--force) local force=true; shift 1;;
-*) options+=($1); exit 1;; -*) options+=($1); exit 1;;
*) break;; *) break;;
esac esac
@ -108,8 +108,8 @@ gitsquash() {
((#!=2)) && echo "Usage: [options] <startcommit> <endcommit>" && return 1 ((#!=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 [[ -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) local 1=$(git rev-parse $1)
2=$(git rev-parse $2) local 2=$(git rev-parse $2)
[ $(git rev-list $1 --count) -lt $(git rev-list $2 --count) ] && t=$1 && 1=$2 && 2=$t [ $(git rev-list $1 --count) -lt $(git rev-list $2 --count) ] && t=$1 && 1=$2 && 2=$t
gitcommits -q $1 gitcommits -q $1
@ -129,17 +129,17 @@ gitsquash() {
# given a committish, this command saves a list of commits between the HEAD and the given committish into the .git directory # 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 # when ran without parameters it applies the saved list of commits onto the current HEAD
gitcommits() { gitcommits() {
verbosity=1 local verbosity=1
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
case $1 in case $1 in
-v) verbosity=2; shift 1;; -v) verbosity=2; shift 1;;
-q|--quiet) verbosity=0; shift 1;; -q|--quiet) verbosity=0; shift 1;;
--theirs) params=(-X theirs); shift 1;; --theirs) local params=(-X theirs); shift 1;;
*) break;; *) break;;
esac esac
done done
stashed="$(git rev-parse --show-toplevel)/.git/stashed-commits" local stashed="$(git rev-parse --show-toplevel)/.git/stashed-commits"
if [ $1 ]; then if [ $1 ]; then
if [ $verbosity -eq 0 ] if [ $verbosity -eq 0 ]
then git rev-list --reverse HEAD...$1 >$stashed then git rev-list --reverse HEAD...$1 >$stashed
@ -151,8 +151,8 @@ gitcommits() {
[ $aborted ] && rest+=($commit) && continue [ $aborted ] && rest+=($commit) && continue
[ $verbosity -gt 0 ] && git --no-pager log --oneline -1 $commit [ $verbosity -gt 0 ] && git --no-pager log --oneline -1 $commit
git-withdate $commit cherry-pick $commit ${params:0} >/dev/null git-withdate $commit cherry-pick $commit ${params:0} >/dev/null
last=$? local last=$?
[ $last -gt 0 ] && aborted=true && typeset -a rest && continue [ $last -gt 0 ] && local 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 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 [ $verbosity -gt 1 ] && git status -s
done done