summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rwxr-xr-xinclude/git.sh4
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