diff options
| author | Michael Allen <michael@michaelallen.io> | 2015-08-30 16:36:48 +0100 |
|---|---|---|
| committer | Michael Allen <michael@michaelallen.io> | 2015-08-30 16:36:48 +0100 |
| commit | 5b5c784e6caf83652d92532f426f3f8d40836b21 (patch) | |
| tree | 78fbdf56a4deac771c7e901fc971f145199de756 /radar-base.sh | |
| parent | 18a19fc516400f2f8db8925b599b70037ac04403 (diff) | |
| download | git-sonar-5b5c784e6caf83652d92532f426f3f8d40836b21.tar.gz git-sonar-5b5c784e6caf83652d92532f426f3f8d40836b21.zip | |
Fix mistaken colour assignment
Diffstat (limited to 'radar-base.sh')
| -rwxr-xr-x | radar-base.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/radar-base.sh b/radar-base.sh index cb1d4b6..700ec22 100755 --- a/radar-base.sh +++ b/radar-base.sh @@ -351,8 +351,8 @@ bash_color_changes_status() { if [[ -n "$porcelain" ]]; then local staged_changes="$(staged_status "$porcelain" "$COLOR_CHANGES_STAGED" "$RESET_COLOR_CHANGES")" local unstaged_changes="$(unstaged_status "$porcelain" "$COLOR_CHANGES_UNSTAGED" "$RESET_COLOR_CHANGES")" - local untracked_changes="$(untracked_status "$porcelain" "$COLOR_CHANGES_CONFLICTED" "$RESET_COLOR_CHANGES")" - local conflicted_changes="$(conflicted_status "$porcelain" "$COLOR_CHANGES_UNTRACKED" "$RESET_COLOR_CHANGES")" + local untracked_changes="$(untracked_status "$porcelain" "$COLOR_CHANGES_UNTRACKED" "$RESET_COLOR_CHANGES")" + local conflicted_changes="$(conflicted_status "$porcelain" "$COLOR_CHANGES_CONFLICTED" "$RESET_COLOR_CHANGES")" if [[ -n "$staged_changes" ]]; then staged_changes="$separator$staged_changes" fi @@ -383,8 +383,8 @@ zsh_color_changes_status() { if [[ -n "$porcelain" ]]; then local staged_changes="$(staged_status "$porcelain" "$COLOR_CHANGES_STAGED" "$RESET_COLOR_CHANGES")" local unstaged_changes="$(unstaged_status "$porcelain" "$COLOR_CHANGES_UNSTAGED" "$RESET_COLOR_CHANGES")" - local untracked_changes="$(untracked_status "$porcelain" "$COLOR_CHANGES_CONFLICTED" "$RESET_COLOR_CHANGES")" - local conflicted_changes="$(conflicted_status "$porcelain" "$COLOR_CHANGES_UNTRACKED" "$RESET_COLOR_CHANGES")" + local untracked_changes="$(untracked_status "$porcelain" "$COLOR_CHANGES_UNTRACKED" "$RESET_COLOR_CHANGES")" + local conflicted_changes="$(conflicted_status "$porcelain" "$COLOR_CHANGES_CONFLICTED" "$RESET_COLOR_CHANGES")" if [[ -n "$staged_changes" ]]; then staged_changes="$separator$staged_changes" fi |