diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-11-01 10:34:05 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-11-01 16:36:16 +0000 |
| commit | 1f1498be7421ae4500ad0d6d40ca0eefbcf8f1a2 (patch) | |
| tree | 6dec94c650526e5f2e345a5c15aef94825ff50f0 /include | |
| parent | 82bd87fa160a4f37136ad04a33091b08eb48d829 (diff) | |
Libreboot 2023110120231101
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
| -rwxr-xr-x | include/git.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |