make: when mfc aborts clear it and switch back

2026-03-13 08:09:41 +00:00 · 2021-03-26 08:39:54 +01:00 · 2021-03-26 08:39:54 +01:00 · eefb5301e6
commit eefb5301e6
parent 9d099c7177
1 changed files with 3 additions and 1 deletions
--- a/4
+++ b/4
@ -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