Merge branch 'DrVanScott-fixMulti'

gitstatus.sh

@@ -26,15 +26,26 @@ num_conflicts=0
 num_untracked=0
 while IFS='' read -r line || [[ -n "$line" ]]; do
   status=${line:0:2}
+  while [[ -n $status ]]; do
     case "$status" in
-    \#\#) branch_line="${line/\.\.\./^}" ;;
+      #two fixed character matches, loop finished
-    ?M) ((num_changed++)) ;;&
+      \#\#) branch_line="${line/\.\.\./^}"; break ;;
-    ?D) ((num_changed++)) ;;&
+      \?\?) ((num_untracked++)); break ;;
-    U?) ((num_conflicts++)) ;;&
+      U?) ((num_conflicts++)); break;;
-    \?\?) ((num_untracked++)) ;;
+      ?U) ((num_conflicts++)); break;;
-    \ ?) ;;
+      DD) ((num_conflicts++)); break;;
+      AA) ((num_conflicts++)); break;;
+      #two character matches, first loop
+      ?M) ((num_changed++)) ;;
+      ?D) ((num_changed++)) ;;
+      ?\ ) ;;
+      #single character matches, second loop
+      U) ((num_conflicts++)) ;;
+      \ ) ;;
       *) ((num_staged++)) ;;
     esac
+    status=${status:0:-1}
+  done
 done <<< "$gitstatus"
 
 num_stashed=0