mirror of
https://github.com/jimeh/git-aware-prompt.git
synced 2026-02-19 13:36:38 +00:00
Some whitespace cleanup
This commit is contained in:
56
prompt.sh
56
prompt.sh
@@ -3,40 +3,40 @@ find_git_branch() {
|
|||||||
# Based on: http://stackoverflow.com/a/13003854/170413
|
# Based on: http://stackoverflow.com/a/13003854/170413
|
||||||
if branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
|
if branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
|
||||||
then
|
then
|
||||||
if [[ "$branch" == "HEAD" ]]; then
|
if [[ "$branch" == "HEAD" ]]; then
|
||||||
branch='(detached head)'
|
branch='(detached head)'
|
||||||
fi
|
fi
|
||||||
git_branch="($branch)"
|
git_branch="($branch)"
|
||||||
else
|
else
|
||||||
git_branch=""
|
git_branch=""
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
find_git_dirty() {
|
find_git_dirty() {
|
||||||
if [[ -z "$git_branch" ]]
|
if [[ -z "$git_branch" ]]
|
||||||
then
|
then
|
||||||
git_dirty=''
|
git_dirty=''
|
||||||
else
|
else
|
||||||
# Based on: http://stackoverflow.com/a/2659808/170413
|
# Based on: http://stackoverflow.com/a/2659808/170413
|
||||||
local err
|
local err
|
||||||
if err=$(git diff-files --quiet 2>&1)
|
if err=$(git diff-files --quiet 2>&1)
|
||||||
then
|
then
|
||||||
if git diff-index --quiet --cached HEAD
|
if git diff-index --quiet --cached HEAD
|
||||||
then
|
then
|
||||||
git_dirty=''
|
git_dirty=''
|
||||||
else
|
else
|
||||||
# Can't figure out different colors
|
# Can't figure out different colors
|
||||||
git_dirty="^"
|
git_dirty="^"
|
||||||
fi
|
fi
|
||||||
elif [ -n "$err" ]
|
elif [ -n "$err" ]
|
||||||
then
|
then
|
||||||
# Some error - most likely that it was run within $GIT_DIR
|
# Some error - most likely that it was run within $GIT_DIR
|
||||||
# Resolve repo root instead? `git rev-parse --git-dir` does not work, nor does the 'git root' alias trick
|
# Resolve repo root instead? `git rev-parse --git-dir` does not work, nor does the 'git root' alias trick
|
||||||
git_dirty=""
|
git_dirty=""
|
||||||
else
|
else
|
||||||
git_dirty="*"
|
git_dirty="*"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
PROMPT_COMMAND="find_git_branch; find_git_dirty; $PROMPT_COMMAND"
|
PROMPT_COMMAND="find_git_branch; find_git_dirty; $PROMPT_COMMAND"
|
||||||
|
|||||||
Reference in New Issue
Block a user