core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Abort any existing patches when applying

This commit is contained in:
md_5 2013-03-23 10:05:32 +11:00
parent 3f493d0785
commit 836578ab76
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
applyPatches.sh
View File

@ -21,6 +21,7 @@ function applyPatch {
git fetch upstream >/dev/null 2>&1 git fetch upstream >/dev/null 2>&1
git reset --hard upstream/upstream git reset --hard upstream/upstream
echo " Applying patches to $target..." echo " Applying patches to $target..."
git am --abort
git am --3way $basedir/${what}-Patches/*.patch git am --3way $basedir/${what}-Patches/*.patch
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
echo " Something did not apply cleanly to $target." echo " Something did not apply cleanly to $target."