Merge pull request #228 from ogr3/num-conflicts

check num_conflicts against 0
10 years ago · 485d12adb3
parent 75e50b1649 5182ee9d35
commit 485d12adb3
1 changed files with 1 additions and 1 deletions
--- a/gitstatus.sh
+++ b/gitstatus.sh
@ -46,7 +46,7 @@ if [[ "$__GIT_PROMPT_IGNORE_STASH" != "1" ]]; then
 fi

 clean=0
-if (( num_changed == 0 && num_staged == 0 && num_untracked == 0 && num_stashed == 0 && num_conflicts )) ; then
+if (( num_changed == 0 && num_staged == 0 && num_untracked == 0 && num_stashed == 0 && num_conflicts == 0)) ; then
  clean=1
 fi