Abort any existing patches when applying

2013-03-23 10:05:32 +11:00 · 2013-03-23 10:05:32 +11:00 · 836578ab76
parent 3f493d0785
commit 836578ab76
1 changed files with 1 additions and 0 deletions
--- a/applyPatches.sh
+++ b/applyPatches.sh
@ -21,6 +21,7 @@ function applyPatch {
    git fetch upstream >/dev/null 2>&1
    git reset --hard upstream/upstream
    echo "  Applying patches to $target..."
+    git am --abort
    git am --3way $basedir/${what}-Patches/*.patch
    if [ "$?" != "0" ]; then
        echo "  Something did not apply cleanly to $target."