From eefb5301e6cf53ee8f2304bfbf9f8c1f2957da14 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 26 Mar 2021 08:39:54 +0100
Subject: [PATCH] make: when mfc aborts clear it and switch back

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1af274565..b0b8b2848 100644
--- a/Makefile
+++ b/Makefile
@@ -449,7 +449,9 @@ mfc: ensure-stable clean-mfcdir
 	fi
 .else
 	@git checkout stable/${CORE_ABI}
-	@git cherry-pick -x ${MFC}
+	@if ! git cherry-pick -x ${MFC}; then \
+		git cherry-pick --abort; \
+	fi
 .endif
 	@git checkout master
 .endfor