Abort any existing patches when applying

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot 2013-03-23 10:05:32 +11:00
parent 637ef9d41a
commit da32cfac56

View File

@ -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."