diff options
| author | Aikar <[email protected]> | 2020-06-24 04:38:17 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-06-24 04:41:14 -0400 |
| commit | a28f80090ec6bd48069cac782382d4ea9ea012a8 (patch) | |
| tree | f98182db7e96e678251b5b7d5a565939d422aff5 /scripts | |
| parent | ec9fa36908090f19f99bcd326cec856245c887dd (diff) | |
| download | Paper-a28f80090ec6bd48069cac782382d4ea9ea012a8.tar.gz Paper-a28f80090ec6bd48069cac782382d4ea9ea012a8.zip | |
Initial prep for 1.16
Remove patcehs we know need to go
add comment on one im not sure should be dropped
go ahead and fix patched repos to turn off gpg signing, as this
helps rebase/apply --continue commands not suck.
Go ahead and prep the pom file change
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/applyPatches.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/applyPatches.sh b/scripts/applyPatches.sh index e4c073fda2..e700fde80b 100755 --- a/scripts/applyPatches.sh +++ b/scripts/applyPatches.sh @@ -39,6 +39,7 @@ function applyPatch { statusfile=".git/patch-apply-failed" rm -f "$statusfile" + git config commit.gpgsign false $gitcmd am --abort >/dev/null 2>&1 # Special case Windows handling because of ARG_MAX constraint |