diff --git a/bashrc b/bashrc
index 957c0a2..30984b9 100644
--- a/bashrc
+++ b/bashrc
@@ -27,8 +27,9 @@ prompt_command()
         (*)       printf '\033]0;%s\007' "${HOSTNAME%%.*}";;
     esac
     ((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
 # }}}
 # {{{ aliases
diff --git a/zshrc b/zshrc
index 3202bfc..07d0add 100644
--- a/zshrc
+++ b/zshrc
@@ -98,7 +98,7 @@ precmd.is_git_repo() {
 precmd.git() {
     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 staged_count=0 unstaged_count=0 untracked_count=0 unmerged_count=0