From c1c4a95edccf6badcdff006dd120d9c910523d0f Mon Sep 17 00:00:00 2001 From: Ivan Pekov Date: Fri, 14 Aug 2020 18:23:20 +0300 Subject: [PATCH] Do NOT apply removed patches Closes #89 --- PATCHES.md | 1 - scripts/applyUpstream.sh | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/PATCHES.md b/PATCHES.md index 72f466c7..b7e38cf2 100644 --- a/PATCHES.md +++ b/PATCHES.md @@ -21,7 +21,6 @@ # Patches | server | Add option to disable saving projectiles to disk | William Blake Galbreath | | | server | Add permission for F3+N debug | William Blake Galbreath | | | server | Akarin Updated Save json list async | tsao chi | | -| server | Akarin updated Async Path Finding | tsao chi | Bud Gidiere | | server | Allow to change the piston push limit | tr7zw | | | server | Alternative Keepalive Handling | William Blake Galbreath | | | server | Apply advancements async | Mariell Hoversholm | | diff --git a/scripts/applyUpstream.sh b/scripts/applyUpstream.sh index ada245b4..a98657e2 100755 --- a/scripts/applyUpstream.sh +++ b/scripts/applyUpstream.sh @@ -7,6 +7,11 @@ function enableCommitSigningIfNeeded { git config commit.gpgsign true fi } + +if [ "$2" == "removed" ]; then + exit 0 +fi + # Disable GPG signing before AM, slows things down and doesn't play nicely. # There is also zero rational or logical reason to do so for these sub-repo AMs. # Calm down kids, it's re-enabled (if needed) immediately after, pass or fail.