From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 13 Dec 2018 08:41:18 +0000 (-0500)
Subject: r: ignore Fast-forwarded lines
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c6a724ca581a2ac547cdab694176ace15fbbad8c;p=home.git

r: ignore Fast-forwarded lines
---

diff --git a/.bin/r b/.bin/r
index 8c1c877..641ed64 100755
--- 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