r: ignore Fast-forwarded lines

diff --git a/.bin/r b/.bin/r
index 8c1c87723928a729a89805f8b07eb6ead084b536..641ed64216f64361682698934e69d155acb561f4 100755 (executable)
--- a/.bin/r
+++ b/.bin/r
@@ -151,14 +151,18 @@ rebase)
                                out=$(env _proj=${proj} r rb all . 2>&1)
                                if [[ -n ${out} ]] ; then
                                        while read line ; do
-                                               if [[ ${line} == "# "* ]] ; then
+                                               case ${line} in
+                                               "Fast-forwarded "*) ;;
+                                               "# "*)
                                                        line="${line#[#] }"
                                                        printf '%s### %s%-40s%s: %s\n' \
                                                                "${BRACKET}" "${GOOD}" "${line%%:*}" "${NORMAL}" "${line#*:}"
-                                               else
+                                                       ;;
+                                               *)
                                                        printf '%s### %s%-40s%s: ERROR: %s\n' \
                                                                "${BRACKET}" "${BAD}" "${dir}" "${NORMAL}" "${line}"
-                                               fi
+                                                       ;;
+                                               esac
                                        done < <(echo "${out}")
                                fi
                                _mj_child