diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2012-01-19 13:56:26 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2012-01-19 13:56:26 +0100 |
| commit | 35c312987b80bfb17828561de4c9839a95f14357 (patch) | |
| tree | 886c1f3f1c0960914a6f59c768cb369ef8cc236a /01_Functions.zsh | |
| parent | 5b384b02bf3a614217ff0b483e4b1851e86faa75 (diff) | |
[Git] shows merges in progress even when there is no modifs..
Diffstat (limited to '01_Functions.zsh')
| -rw-r--r-- | 01_Functions.zsh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/01_Functions.zsh b/01_Functions.zsh index 50d79c5..108d4f8 100644 --- a/01_Functions.zsh +++ b/01_Functions.zsh @@ -295,7 +295,12 @@ get_git_status () my_git_status="$git_colors[init_in_progress]" fi else - my_git_status="$git_colors[up_to_date]" + if [ -f $GIT_DIR/MERGE_HEAD ] + then + my_git_status="$git_colors[cached]" + else + my_git_status="$git_colors[up_to_date]" + fi fi echo $my_git_status @@ -394,7 +399,7 @@ set_prompt_colors () git_colors[cached_and_not_up_to_date]="$prompt_colors[not_up_to_date];$color[bold]" git_colors[not_up_to_date]="$prompt_colors[not_up_to_date];$color[normal]" # git changes in working tree git_colors[init_in_progress]="$color[black];$color[bold]" # initialization - git_colors[up_to_date]="$prompt_colors[up_to_date]" # git up-to-date + git_colors[up_to_date]="$prompt_colors[up_to_date];$color[normal]" # git up-to-date guilt_colors[applied]=$git_colors[cached] guilt_colors[unapplied]=$color[black] |