mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 20:07:41 +01:00
Abort any existing patches when applying
By: md_5 <md_5@live.com.au>
This commit is contained in:
parent
637ef9d41a
commit
da32cfac56
@ -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."
|
||||
|
Loading…
Reference in New Issue
Block a user