josh/files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bash_aliases: rework prompt_ps1_git_branch() to show ahead/behind status

Browse Source
This commit is contained in:
Josh Holtrop 2012-01-19 15:12:59 -05:00
parent 1052bc4fb3
commit 90af463af4
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bash_aliases
View File

@ -25,12 +25,23 @@ alias cdshowgitstatus='if [[ $CDSHOWGITSTATUS_LAST_WD != $PWD ]]; then if [[ -d
#PROMPT_COMMAND="cdshowgitstatus;$PROMPT_COMMAND"
function prompt_ps1_git_branch()
{
if [[ -e /usr/bin/git && "$PCGB_LAST_WD" != "$PWD" ]]; then
current_git_branch=$(git branch 2>/dev/null | grep '^\*' | sed -e 's/^..//');
PCGB_LAST_WD=$PWD;
fi;
if [[ "$current_git_branch" != "" ]]; then
echo -e " [${current_git_branch}]";
which_git=$(which git)
if [[ "$which_git" == "" ]]; then
return
fi
branch_out=$(git branch -vv 2>/dev/null | grep '^\*' | sed -e 's/^..//')
if [[ "$branch_out" == "" ]]; then
return
fi
current_branch=$(echo "$branch_out" | awk '{print $1}')
ahead_behind=$(echo "$branch_out" | grep -E '(ahead|behind)' | sed -re 's/^.*(ahead|behind)(.[0-9]+).*$/\1\2/')
if [[ "$ahead_behind" != "" ]]; then
ahead_behind=": ${ahead_behind}"
fi
if [[ "$branch_out" != "" ]]; then
if [[ "$current_branch" != "" ]]; then
echo -e " [${current_branch}${ahead_behind}]"
fi
fi
}
#put $(prompt_ps1_git_branch) in $PS1 to use it