mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-12 18:55:51 -07:00
.github
Spigot-API-Patches
Spigot-Server-Patches
licenses
scripts
pre-source-patches
apatch.sh
applyPatches.sh
build.sh
checkoutpr.sh
decompile.sh
functions.sh
importmcdev.sh
init.sh
makemcdevsrc.sh
paperclip.sh
rebuildPatches.sh
remap.sh
testServer.sh
upstreamCommit.sh
upstreamMerge.sh
work
.editorconfig
.gitignore
.gitmodules
.travis.yml
CONTRIBUTING.md
LICENSE.md
README.md
paper
pom.xml
38 lines
1.1 KiB
Bash
Executable File
38 lines
1.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
if [ -z "$1" ]; then
|
|
echo "$0 <prID>"
|
|
exit 1;
|
|
fi
|
|
repo=$(git remote get-url origin | sed -E 's/github.com(:|\/)//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')
|
|
prevbranch=$(\git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
|
|
branch="pr/$1"
|
|
up="pr-$1"
|
|
git remote remove $up 2>&1 1>/dev/null
|
|
git remote add -f $up $url
|
|
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
|
|
|
|
echo "Dropping to new shell, exit to delete the refs"
|
|
bash -i
|
|
|
|
read -p "Press 'p' to push. " -n 1 -r >&2
|
|
echo
|
|
if [[ "d$REPLY" =~ ^d[Pp]$ ]]; then
|
|
git push $up $branch:$ref -f
|
|
|
|
echo "Pushed" >&2
|
|
fi
|
|
|
|
echo "Deleting branch/upstream"
|
|
git checkout $prevbranch
|
|
git branch -D $branch
|
|
git remote remove $up
|
|
git gc
|
|
#git branch -u $up/$ref $branch
|
|
#git checkout $branch |