jimeh/git-aware-prompt
1
0
Fork 0
mirror of https://github.com/jimeh/git-aware-prompt.git synced 2026-02-19 13:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some whitespace cleanup

Browse Source
This commit is contained in:
Jim Myhrberg
2013-03-21 18:23:30 +00:00
parent c2b16d3d41
commit 5c5e458653
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -17,7 +17,7 @@ If you `cd` to a Git working directory, you will see the current Git branch name
## Installation ## Installation
Clone the project to a `.bash` folder in your home directory: Clone the project to a `.bash` folder in your home directory:
mkdir ~/.bash mkdir ~/.bash
cd ~/.bash cd ~/.bash
git clone git://github.com/jimeh/git-aware-prompt.git 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 [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/ [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 [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

2
main.sh
View File

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

56
prompt.sh
View File

@@ -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"