von/vdotfiles
1
0
Fork 0
Code Activity

make git status no locking, so that we can work with repos right away

Browse source
This commit is contained in:
Von Random 2019-01-31 12:37:02 +03:00
parent 9130793a39
commit ef69979a0d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bashrc
View file

@ -27,8 +27,9 @@ prompt_command()
(*) printf '\033]0;%s\007' "${HOSTNAME%%.*}";; (*) printf '\033]0;%s\007' "${HOSTNAME%%.*}";;
esac esac
((UID)) && clr=8 || clr=1 ((UID)) && clr=8 || clr=1
PS1="[ bash-\\v $(colorize "$clr" \\u) \\h:$(colorize 8 "$(pwd)") ]\\n> " echo "[ bash-$BASH_VERSINFO | $(colorize "$clr" $USER) $HOSTNAME:$(colorize 8 "$(pwd)") ]"
} }
PS1='> '
PROMPT_COMMAND=prompt_command PROMPT_COMMAND=prompt_command
# }}} # }}}
# {{{ aliases # {{{ aliases

2
zshrc
View file

@ -98,7 +98,7 @@ precmd.is_git_repo() {
precmd.git() { precmd.git() {
precmd.is_git_repo || return 0 precmd.is_git_repo || return 0
local raw_status="$(git status --porcelain -bu 2>/dev/null)" local raw_status="$(git --no-optional-locks status --porcelain -bu 2>/dev/null)"
local branch_info full_status git_status= IFS= local branch_info full_status git_status= IFS=
local staged_count=0 unstaged_count=0 untracked_count=0 unmerged_count=0 local staged_count=0 unstaged_count=0 untracked_count=0 unmerged_count=0