summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonid Volnitsky <Leonid@Volnitsky.com>2009-10-24 12:58:46 +0300
committerLeonid Volnitsky <Leonid@Volnitsky.com>2009-10-24 12:58:46 +0300
commit5af61d50833deadc8fc60a88f951795396cde150 (patch)
tree6716d39428fc619069daacb5f628861b8ebc2664
parentadded git locked state (diff)
downloadgit-prompt-5af61d50833deadc8fc60a88f951795396cde150.tar.gz
git-prompt-5af61d50833deadc8fc60a88f951795396cde150.tar.bz2
git-prompt-5af61d50833deadc8fc60a88f951795396cde150.zip
fixed: in locked state "git status" does not work
-rwxr-xr-xgit-prompt.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-prompt.sh b/git-prompt.sh
index 4fd763e..d6b0492 100755
--- a/git-prompt.sh
+++ b/git-prompt.sh
@@ -175,7 +175,7 @@ cwd_truncate() {
# split path into: head='~/', truncateble middle, last_dir
local cwd_max_length=$1
- # expression wich bash-3.1 or older can not understand, so we wrap it in eval
+ # expression which bash-3.1 or older can not understand, so we wrap it in eval
exp31='[[ "$cwd" =~ (~?/)(.*/)([^/]*)$ ]]'
if eval $exp31 ; then # only valid if path have more then 1 dir
local path_head=${BASH_REMATCH[1]}
@@ -392,7 +392,7 @@ parse_git_status() {
added_files=()
modified_files=()
untracked_files=()
- unset status modified added clean init added mixed untracked op detached
+ unset branch status modified added clean init added mixed untracked op detached
# quoting hell
eval " $(