Merge pull request #1 from ogr3/fixMulti

Indentation same as other loop constructs
master
DrVanScott 10 years ago committed by GitHub
commit 9dd07680ee
  1. 9
      gitstatus.sh

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

Loading…
Cancel
Save