geforkt von Mirrors/Paper
Abort any existing patches when applying
Dieser Commit ist enthalten in:
Ursprung
3f493d0785
Commit
836578ab76
@ -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."
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren