diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/git.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/git.sh b/include/git.sh index 57d8f4f9..7d06479a 100755 --- a/include/git.sh +++ b/include/git.sh @@ -151,10 +151,9 @@ git_am_patches() [ -L "${patch}" ] && continue [ -f "${patch}" ] || continue git am "${patch}" || patchfail="y" - if [ "${patchfail}" = "y" ]; then - git am --abort || err "${sdir}: !git am --abort" - err "!git am ${patch} -> ${sdir}" - fi + [ "${patchfail}" != "y" ] && continue + git am --abort || err "${sdir}: !git am --abort" + err "!git am ${patch} -> ${sdir}" done ) || err "PATCH FAILURE" for patches in "${patchdir}/"*; do |