Some whitespace cleanup

This commit is contained in:
2013-03-21 18:23:30 +00:00
parent c2b16d3d41
commit 5c5e458653
3 changed files with 31 additions and 31 deletions

View File

@@ -17,7 +17,7 @@ If you `cd` to a Git working directory, you will see the current Git branch name
## Installation
Clone the project to a `.bash` folder in your home directory:
mkdir ~/.bash
cd ~/.bash
git clone git://github.com/jimeh/git-aware-prompt.git
@@ -67,4 +67,4 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
[2]: http://railstips.org/2009/2/2/bedazzle-your-bash-prompt-with-git-info
[3]: http://techblog.floorplanner.com/2008/12/14/working-with-git-branches/
[4]: http://www.intridea.com/2009/2/2/git-status-in-your-prompt
[5]: http://www.cyberciti.biz/tips/howto-linux-unix-bash-shell-setup-prompt.html
[5]: http://www.cyberciti.biz/tips/howto-linux-unix-bash-shell-setup-prompt.html

View File

@@ -1,2 +1,2 @@
source $GITAWAREPROMPT/colors.sh
source $GITAWAREPROMPT/prompt.sh
source $GITAWAREPROMPT/prompt.sh

View File

@@ -3,40 +3,40 @@ find_git_branch() {
# Based on: http://stackoverflow.com/a/13003854/170413
if branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
then
if [[ "$branch" == "HEAD" ]]; then
branch='(detached head)'
fi
git_branch="($branch)"
if [[ "$branch" == "HEAD" ]]; then
branch='(detached head)'
fi
git_branch="($branch)"
else
git_branch=""
fi
}
find_git_dirty() {
if [[ -z "$git_branch" ]]
then
git_dirty=''
else
# Based on: http://stackoverflow.com/a/2659808/170413
local err
if err=$(git diff-files --quiet 2>&1)
then
if git diff-index --quiet --cached HEAD
then
git_dirty=''
else
# Can't figure out different colors
git_dirty="^"
fi
elif [ -n "$err" ]
then
# 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
git_dirty=""
else
git_dirty="*"
fi
fi
if [[ -z "$git_branch" ]]
then
git_dirty=''
else
# Based on: http://stackoverflow.com/a/2659808/170413
local err
if err=$(git diff-files --quiet 2>&1)
then
if git diff-index --quiet --cached HEAD
then
git_dirty=''
else
# Can't figure out different colors
git_dirty="^"
fi
elif [ -n "$err" ]
then
# 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
git_dirty=""
else
git_dirty="*"
fi
fi
}
PROMPT_COMMAND="find_git_branch; find_git_dirty; $PROMPT_COMMAND"