Merge branch 'DrVanScott-fixMulti'

10 years ago · 9497f55601
parent 85a2752f71 1dc7dbafa0
commit 9497f55601
1 changed files with 4 additions and 3 deletions
--- a/gitstatus.sh
+++ b/gitstatus.sh
@ -28,10 +28,11 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
  status=${line:0:2}
  case "$status" in
    \#\#) branch_line="${line/\.\.\./^}" ;;
-    ?M) ((num_changed++)) ;;
-    ?D) ((num_changed++)) ;;
-    U?) ((num_conflicts++)) ;;
+    ?M) ((num_changed++)) ;;&
+    ?D) ((num_changed++)) ;;&
+    U?) ((num_conflicts++)) ;;&
    \?\?) ((num_untracked++)) ;;
+    \ ?) ;;
    *) ((num_staged++)) ;;
  esac
 done <<< "$gitstatus"