From 96dbac365c9fdc01ad191fbb32dd628a62f8bbb0 Mon Sep 17 00:00:00 2001 From: granny Date: Fri, 14 Apr 2023 00:27:04 -0700 Subject: [PATCH] [ci-skip] stop needing to specify --paper in upstreamCommit --- scripts/upstreamCommit.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh index aa68a6396..94c5e78b3 100755 --- a/scripts/upstreamCommit.sh +++ b/scripts/upstreamCommit.sh @@ -3,7 +3,7 @@ # requires curl & jq # upstreamCommit --paper HASH --pufferfish HASH -# flag: --paper HASH - the commit hash to use for comparing commits between paper (PaperMC/Paper/compare/HASH...HEAD) +# flag: --paper HASH - (Optional) the commit hash to use for comparing commits between paper (PaperMC/Paper/compare/HASH...HEAD) # flag: --pufferfish HASH - the commit hash to use for comparing commits between pufferfish (pufferfish-gg/Pufferfish/compare/HASH...HEAD) function getCommits() { @@ -14,7 +14,7 @@ function getCommits() { set -e PS1="$" -paperHash="" +paperHash=$(git diff gradle.properties | awk '/^-paperCommit =/{print $NF}') pufferfishHash="" TEMP=$(getopt --long paper:,pufferfish: -o "" -- "$@") @@ -70,6 +70,8 @@ fi disclaimer="Upstream has released updates that appear to apply and compile correctly" log="Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}" +git add gradle.properties + echo -e "$log" | git commit -F - ) || exit 1