1.16.2 Release (#4123)

PaperMC believes that 1.16.2 is now ready for general release as we fixed the main issue plagueing the 1.16.x release, the MapLike data conversion issues.

Until now, it was not safe for a server to convert a world to 1.16.2 without data conversion issues around villages and potentially other things. If you did, those MapLike errors meant something went wrong.

This is now resolved.

Big thanks to all those that helped, notably @BillyGalbreath and @Proximyst who did large parts of the update process with me.

Please as always, backup your worlds and test before updating to 1.16.2!

If you update to 1.16.2, there is no going back to an older build than this.

---------------------------------

Co-authored-by: William Blake Galbreath <[email protected]>
Co-authored-by: Mariell Hoversholm <[email protected]>
Co-authored-by: krolik-exe <[email protected]>
Co-authored-by: BillyGalbreath <[email protected]>
Co-authored-by: stonar96 <[email protected]>
Co-authored-by: Shane Freeder <[email protected]>
Co-authored-by: Jason <[email protected]>
Co-authored-by: kashike <[email protected]>
Co-authored-by: Aurora <[email protected]>
Co-authored-by: KennyTV <[email protected]>
Co-authored-by: commandblockguy <[email protected]>
Co-authored-by: DigitalRegent <[email protected]>
Co-authored-by: ishland <[email protected]>

1 files changed, 23 insertions, 7 deletions

diff --git a/scripts/checkoutpr.sh b/scripts/checkoutpr.sh
index 3d07227ff6..204fb0ed9f 100755
--- a/scripts/checkoutpr.sh
+++ b/scripts/checkoutpr.sh
@@ -3,7 +3,7 @@ if [ -z "$1" ]; then
 	echo "$0 <prID>"
 	exit 1;
 fi
-repo=$(git remote get-url origin | sed -E 's/github.com(:|\/)//g')
+repo=$(git remote get-url origin | sed -E 's/(.*@)?github.com(:|\/)//g' | sed 's/.git$//g')
 data=$(curl -q https://api.github.com/repos/$repo/pulls/$1 2>/dev/null)
 url=$(echo -e "$data" | grep --color=none ssh_url | head -n 1 |awk '{print $2}' | sed 's/"//g' | sed 's/,//g')
 ref=$(echo -e "$data" | grep --color=none '"head":' -A 3 | grep ref | head -n 1 |awk '{print $2}' | sed 's/"//g' | sed 's/,//g')
@@ -16,23 +16,39 @@ git branch -D $branch 2>/dev/null 1>&2
 git checkout -b $branch $up/$ref 2>/dev/null|| true
 echo "Merging $prevbranch into $branch"
 git fetch origin
-git merge origin/$prevbranch
-
+read -p "Press 'm' to merge, 'r' to rebase, or 'n' for nothing" -n 1 -r >&2
+echo
+if [[ "$REPLY" =~ ^[Mm]$ ]]; then
+	git merge origin/$prevbranch
+elif [[ "$REPLY" =~ ^[Rr]$ ]]; then
+	git rebase master
+fi
 echo "Dropping to new shell, exit to delete the refs"
-bash -i
+"${SHELL:-bash}" -i
 
 read -p "Press 'p' to push. " -n 1 -r >&2
 echo
-if [[ "d$REPLY" =~ ^d[Pp]$ ]]; then
+pushed=0
+if [[ "$REPLY" =~ ^[Pp]$ ]]; then
 	git push $up $branch:$ref -f
-
+	pushed=1
 	echo "Pushed" >&2
 fi
 
 echo "Deleting branch/upstream"
 git checkout $prevbranch
+if [[ "$pushed" == "1" ]]; then
+	read -p "Press 'm' to merge or 'r' to rebase merge " -n 1 -r >&2
+	if [[ "$REPLY" =~ ^[Mm]$ ]]; then
+		git merge $branch
+	fi
+	if [[ "$REPLY" =~ ^[Rr]$ ]]; then
+		git merge --ff-only $branch
+	fi
+fi
+
 git branch -D $branch
 git remote remove $up
 git gc
 #git branch -u $up/$ref $branch
-#git checkout $branch
\ No newline at end of file
+#git checkout $branch