From 591a5bac1c53a1ee3e0930ee483d857a780ab3e6 Mon Sep 17 00:00:00 2001 From: Von Random Date: Wed, 15 Nov 2017 15:24:08 +0300 Subject: [PATCH] a function to run git clean and reset commands, a little bit of refactoring --- zshrc | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/zshrc b/zshrc index 6dd429a..89d4c6c 100644 --- a/zshrc +++ b/zshrc @@ -79,8 +79,7 @@ precmd.title() { ;; esac } -precmd.is_git_repo() -{ +precmd.is_git_repo() { local curr_dir=$PWD while [[ -n $curr_dir ]]; do if [[ -r $curr_dir/.git/HEAD ]]; then @@ -91,8 +90,7 @@ precmd.is_git_repo() done return 1 } -precmd.git() -{ +precmd.git() { precmd.is_git_repo || return 0 local raw_status="$(git status --porcelain -bu 2>/dev/null)" @@ -122,16 +120,16 @@ precmd.git_update() { precmd.git > $prompt_state_file kill -s USR1 $$ } -TRAPUSR1() { - prompt_git_data="$(<$prompt_state_file)" - precmd.prompt - zle && zle reset-prompt -} precmd() { precmd.title precmd.prompt precmd.git_update &! } +TRAPUSR1() { + prompt_git_data="$(<$prompt_state_file)" + precmd.prompt + zle && zle reset-prompt +} TRAPEXIT() { [[ -r $prompt_state_file ]] && rm $prompt_state_file } @@ -159,7 +157,7 @@ alias atmux='command tmux -2 attach' alias rscreen='command screen -Dr' alias scr='command screen sudo -Es' # }}} -# {{{ global aliases +# {{{ awesome zsh only aliases alias -g L='| less -R' alias -g H='| head' alias -g T='| tail' @@ -176,8 +174,6 @@ alias -g WK='| iconvwk' alias -g UK='| iconvuk' alias -g KU='| iconvku' alias -g WU='| iconvwu' -# }}} -# {{{ suffix aliases alias -s {txt,xml,cfg,cnf,conf,ini.erb.pp}=${EDITOR} alias -s {mkv,mp4,avi,mpg,mp3,ogg,mpeg,mov,webm,flv}='mpv' alias -s {jpg,png,gif,bmp,jpeg}='eog' @@ -228,4 +224,10 @@ gdf() { gdiff "$@" fi } +greset() { + echo "OK to reset and clean teh repo?" + read _ + /usr/bin/git clean -fd + /usr/bin/git reset --hard +} # }}}