w33ble/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix github patch url

Browse Source 
Also make curl follow redirects in the future
This commit is contained in:
Joe Fleming
2015-04-22 17:26:22 -07:00
committed by Joe Fleming
parent ecca76ea6e
commit 21f4828eec
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git/githelpers
View File

@@ -104,6 +104,7 @@ backport_pr() {
REMOTE=$3 REMOTE=$3
: ${REMOTE:=$DEFAULT_REMOTE} : ${REMOTE:=$DEFAULT_REMOTE}
THISBRANCH=`git rev-parse --abbrev-ref HEAD` THISBRANCH=`git rev-parse --abbrev-ref HEAD`
URL="https://patch-diff.githubusercontent.com/raw/elastic/kibana/pull/${PR}.patch"
if [ -z "$PR" ]; then if [ -z "$PR" ]; then
echo "Please specify a PR to backport" echo "Please specify a PR to backport"
@@ -111,7 +112,7 @@ backport_pr() {
fi fi
echo Backporting ${PR} to ${BRANCH} from ${REMOTE} echo Backporting ${PR} to ${BRANCH} from ${REMOTE}
git checkout ${BRANCH} && git pull ${REMOTE} ${BRANCH} && curl -s "https://github.com/elastic/kibana/pull/${PR}.patch" | git am git checkout ${BRANCH} && git pull ${REMOTE} ${BRANCH} && curl -L -s "$URL" | git am
# if the backport couldn't be cleanly applied, tell the user and exit # if the backport couldn't be cleanly applied, tell the user and exit
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then