Merge elementsproject/secp256k1-zkp#135: sync-upstream: fix "end" parameter for specifying range
907633e2e9abec15be48256f00c2f4c76855a9f6 sync-upstream: fix "end" parameter for specifying range (Tim Ruffing) 394f49fd1a6e88d2a5f9a6c80da897ec389fc59c sync-upstream: quote variables (Tim Ruffing) Pull request description: ACKs for top commit: jonasnick: utACK 907633e2e9abec15be48256f00c2f4c76855a9f6 Tree-SHA512: ba7834bf7fce403de29027e8df9387bbc6df5ba62eaacc31547bff0587962620475940b253966d0af0a3a4b3b12b4f72b64c8832aeffc638a308405a3945b6c2
This commit is contained in:
commit
91b64770c3
@ -22,11 +22,11 @@ if [ "$#" -lt 1 ]; then
|
||||
fi
|
||||
|
||||
REMOTE=upstream
|
||||
REMOTE_BRANCH=$REMOTE/master
|
||||
REMOTE_BRANCH="$REMOTE/master"
|
||||
# Makes sure you have a remote "upstream" that is up-to-date
|
||||
setup() {
|
||||
ret=0
|
||||
git fetch $REMOTE &> /dev/null || ret=$?
|
||||
git fetch "$REMOTE" &> /dev/null || ret="$?"
|
||||
if [ ${ret} == 0 ]; then
|
||||
return
|
||||
fi
|
||||
@ -36,18 +36,18 @@ setup() {
|
||||
[Yy]* ) ;;
|
||||
* ) exit 1;;
|
||||
esac
|
||||
git remote add $REMOTE git@github.com:bitcoin-core/secp256k1.git &> /dev/null
|
||||
git fetch $REMOTE &> /dev/null
|
||||
git remote add "$REMOTE" git@github.com:bitcoin-core/secp256k1.git &> /dev/null
|
||||
git fetch "$REMOTE" &> /dev/null
|
||||
}
|
||||
|
||||
range() {
|
||||
RANGESTART_COMMIT=$(git merge-base $REMOTE_BRANCH master)
|
||||
RANGEEND_COMMIT=$(git rev-parse $REMOTE_BRANCH)
|
||||
RANGESTART_COMMIT=$(git merge-base "$REMOTE_BRANCH" master)
|
||||
RANGEEND_COMMIT=$(git rev-parse "$REMOTE_BRANCH")
|
||||
if [ "$#" = 1 ]; then
|
||||
RANGEEND_COMMIT=$1
|
||||
fi
|
||||
|
||||
COMMITS=$(git --no-pager log --oneline "$REMOTE_BRANCH" --merges "$RANGESTART_COMMIT".."$RANGEEND_COMMIT")
|
||||
COMMITS=$(git --no-pager log --oneline --merges "$RANGESTART_COMMIT".."$RANGEEND_COMMIT")
|
||||
COMMITS=$(echo "$COMMITS" | tac | awk '{ print $1 }' ORS=' ')
|
||||
echo "Merging $COMMITS. Continue with y"
|
||||
read -r yn
|
||||
@ -101,7 +101,7 @@ git pull
|
||||
git checkout -b temp-merge-"$PRNUM"
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
FNAME=$BASEDIR/gh-pr-create.sh
|
||||
FNAME="$BASEDIR/gh-pr-create.sh"
|
||||
cat <<EOT > "$FNAME"
|
||||
#!/bin/sh
|
||||
gh pr create -t "$TITLE" -b "$BODY" --web
|
||||
|
Loading…
x
Reference in New Issue
Block a user