diff options
| author | Claudio Bandera <claudio.bandera@kit.edu> | 2015-09-17 17:52:40 +0200 |
|---|---|---|
| committer | Claudio Bandera <claudio.bandera@kit.edu> | 2015-09-17 17:52:40 +0200 |
| commit | f16f1e67a2f2908bfb11fa67f1a5185bc0b2be0f (patch) | |
| tree | e4b1bbfb70317f0cb5247b3416ceeb6621a52be4 /prompt.bash | |
| parent | 4a7d636bad0d03af22f440bef9bd141bfc0dc309 (diff) | |
| parent | 1f6a8f84946a0cb6936916f47b5a3870fa12a5a6 (diff) | |
| download | git-sonar-f16f1e67a2f2908bfb11fa67f1a5185bc0b2be0f.tar.gz git-sonar-f16f1e67a2f2908bfb11fa67f1a5185bc0b2be0f.zip | |
Merge branch 'master' into feature/stash_indicator
Conflicts:
prompt.bash
test
Diffstat (limited to 'prompt.bash')
| -rwxr-xr-x | prompt.bash | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/prompt.bash b/prompt.bash index 4d9a36f..3c21114 100755 --- a/prompt.bash +++ b/prompt.bash @@ -1,14 +1,18 @@ #! /usr/bin/env bash dot="$(cd "$(dirname "$0")"; pwd)" +args=$@ source "$dot/radar-base.sh" if is_repo; then + prepare_bash_colors printf " \x01\033[1;30m\x02git:(\x01\033[0m\x02" - bash_color_remote_commits + if show_remote_status $args; then + color_remote_commits + fi readable_branch_name - bash_color_local_commits + color_local_commits printf "\x01\033[1;30m\x02)\x01\033[0m\x02" - bash_color_changes_status + color_changes_status bash_stash_status fi |