w33ble/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added stash notification to git prompt

Browse Source
This commit is contained in:
Joe Fleming
2013-07-09 20:41:51 -07:00
parent 2cdd93a49b
commit fd161bc41c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bash/bash_profile
View File

@@ -11,9 +11,10 @@ CYAN="\[\033[0;36m\]"
LIGHT_GRAY="\[\033[0;37m\]" LIGHT_GRAY="\[\033[0;37m\]"
function parse_git_branch { function parse_git_branch {
git rev-parse --git-dir > /dev/null 2>&1 git rev-parse --git-dir > /dev/null 2>&1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
git_status="$(git status 2> /dev/null)" git_status="$(git status 2> /dev/null)"
git_stash="$(git stash list 2> /dev/null)"
branch_pattern="^# On branch ([^${IFS}]*)" branch_pattern="^# On branch ([^${IFS}]*)"
detached_branch_pattern="# Not currently on any branch" detached_branch_pattern="# Not currently on any branch"
remote_pattern="# Your branch is (.*) of" remote_pattern="# Your branch is (.*) of"
@@ -21,11 +22,15 @@ function parse_git_branch {
untracked_pattern="# Untracked files:" untracked_pattern="# Untracked files:"
new_pattern="new file:" new_pattern="new file:"
not_staged_pattern="Changes not staged for commit" not_staged_pattern="Changes not staged for commit"
#files not staged for commit #files not staged for commit
if [[ ${git_status}} =~ ${not_staged_pattern} ]]; then if [[ ${git_status}} =~ ${not_staged_pattern} ]]; then
state="✔" state="✔"
fi fi
#files stashes
if [[ !${#git_stash} -eq 0 ]]; then
state="${state}☉"
fi
# add an else if or two here if you want to get more specific # add an else if or two here if you want to get more specific
# show if we're ahead or behind HEAD # show if we're ahead or behind HEAD
if [[ ${git_status} =~ ${remote_pattern} ]]; then if [[ ${git_status} =~ ${remote_pattern} ]]; then
@@ -33,8 +38,8 @@ function parse_git_branch {
remote="↑" remote="↑"
else else
remote="↓" remote="↓"
fi fi
fi fi
#new files #new files
if [[ ${git_status} =~ ${new_pattern} ]]; then if [[ ${git_status} =~ ${new_pattern} ]]; then
remote="+" remote="+"
@@ -48,7 +53,7 @@ function parse_git_branch {
remote="↕" remote="↕"
fi fi
#branch name #branch name
if [[ ${git_status} =~ ${branch_pattern} ]]; then if [[ ${git_status} =~ ${branch_pattern} ]]; then
branch=${BASH_REMATCH[1]} branch=${BASH_REMATCH[1]}
#detached branch #detached branch
elif [[ ${git_status} =~ ${detached_branch_pattern} ]]; then elif [[ ${git_status} =~ ${detached_branch_pattern} ]]; then
@@ -61,7 +66,7 @@ function parse_git_branch {
} }
if [ -f `brew --prefix`/etc/bash_completion ]; then if [ -f `brew --prefix`/etc/bash_completion ]; then
. `brew --prefix`/etc/bash_completion . `brew --prefix`/etc/bash_completion
fi fi
export TERM="xterm-color" export TERM="xterm-color"