From 1f1498be7421ae4500ad0d6d40ca0eefbcf8f1a2 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Wed, 1 Nov 2023 10:34:05 +0000
Subject: Libreboot 20231101

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/git.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/git.sh b/include/git.sh
index f97e5e61..fa53fed1 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -137,7 +137,9 @@ git_am_patches()
 	for patch in "${patchdir}/"*; do
 		[ -L "${patch}" ] && continue
 		[ -f "${patch}" ] || continue
-		if ! git am "${patch}"; then
+		patchfail="n"
+		git am "${patch}" || patchfail="y"
+		if [ "${patchfail}" = "y" ]; then
 			git am --abort || err  "${sdir}: !git am --abort"
 			err  "!git am ${patch} -> ${sdir}"
 		fi
-- 
cgit v1.2.1