From 0915159f8137f592cf69797fdaac090ce1b09928 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Mon, 1 Feb 2021 21:35:20 +0000 Subject: [PATCH] Remove unused backport-pr script We no longer use this script, so let's remove it. --- script/backport-pr | 62 ---------------------------------------------- 1 file changed, 62 deletions(-) delete mode 100755 script/backport-pr diff --git a/script/backport-pr b/script/backport-pr deleted file mode 100755 index 15a39c44..00000000 --- a/script/backport-pr +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env bash -# -# Backports a PR into a release branch: -# -# # backport PR #123 into release-0.5-backport-123 -# $ git checkout master -# $ git pull -# $ script/backport-pr 1.1 1023 - -relversion="v$1.x" -relbranch="release-$1" -pr="$2" -prbranch="$relbranch-backport-$pr" -pullsurl="https://api.github.com/repos/git-lfs/git-lfs/pulls" -prurl="https://api.github.com/repos/git-lfs/git-lfs/pulls/$pr" -prjson="$(curl -n $pullsurl/$pr 2>/dev/null)" -headref="$(echo $prjson | jq -r -e ".head.ref")" -[ "$?" -ne 0 ] && { - echo "PR #$pr is invalid." - exit 1 -} -prtitle="$(echo $prjson | jq -r ".title" | sed "s/\"/'/g")" - -git checkout -q -f $relbranch -git clean -q -fdx -git pull -q -git checkout -q -f -B $prbranch - -commit=`git log -1 --pretty=%H "--grep=Merge pull request #$pr" "--grep=Merge branch '.*$headref'" master` - -echo "Backporting:\n" - -git log -1 $commit - -conflicts="" - -git cherry-pick -x --allow-empty -m1 $commit &> /dev/null || { - unmerged=$(git ls-files --unmerged --stage | cut -f 2 -d$'\t' | uniq) - conflicts="\n\nConflicting files:" - for file in $unmerged; do - git add "$file" - conflicts="$conflicts\n- $file" - done - git commit -q --no-edit -} - -commitmsg="Backport $headref from #$pr to $relbranch" -if [ "$conflicts" ]; then - commitmsg="$commitmsg [merge conflicts]" -fi - -git commit -q --allow-empty --amend -m "$commitmsg" -git push -q -f origin $prbranch -git checkout -q -f $relbranch -git branch -q -D $prbranch - -curl -in $pullsurl -d "{ - \"title\": \"Backport #$pr for $relversion: $prtitle\", - \"head\": \"$prbranch\", - \"base\": \"$relbranch\", - \"body\": \"This backports #$pr.$conflicts\" -}" 2>/dev/null