frost/secp256k1-zkp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ElementsProject/secp256k1-zkp#239: sync-upstream: allows providing the local branch via cli

Browse Source 
05b207e969f9b4181061dd3fba749b6df06de718 sync-upstream: allows providing the local branch via cli (Jonas Nick)

Pull request description:

ACKs for top commit:
  real-or-random:
    ACK 05b207e969f9b4181061dd3fba749b6df06de718

Tree-SHA512: b02f3fdf6565943cea2b93a0b2b0a38c30bb3c94873d0c4ed2ad276c75f3dc610911d1c9c076c8b7fd3a5baf83aa1ab66ec86415333cf58fe8f07c64fa74656f
This commit is contained in:
Tim Ruffing 2023-07-17 15:47:02 +02:00
commit 533571d6cf
No known key found for this signature in database
GPG Key ID: 8C461CCD293F6011
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
contrib/sync-upstream.sh
View File

@ -3,12 +3,13 @@
set -eou pipefail set -eou pipefail
help() { help() {
echo "$0 range [end]" echo "$0 [-b <branch>] range [end]"
echo " merges every merge commit present in upstream and missing locally." echo " merges every merge commit present in upstream and missing in <branch> (default: master)."
echo " If the optional [end] commit is provided, only merges up to [end]." echo " If the optional [end] commit is provided, only merges up to [end]."
echo " If the optional [-b branch] provided, then ."
echo echo
echo "$0 select <commit> ... <commit>" echo "$0 [-b <branch>] select <commit> ... <commit>"
echo " merges every selected merge commit" echo " merges every selected merge commit into <branch> (default: master)"
echo echo
echo "This tool creates a branch and a script that can be executed to create the" echo "This tool creates a branch and a script that can be executed to create the"
echo "PR automatically. The script requires the github-cli tool (aka gh)." echo "PR automatically. The script requires the github-cli tool (aka gh)."
@ -17,12 +18,9 @@ help() {
exit 1 exit 1
} }
if [ "$#" -lt 1 ]; then
help
fi
REMOTE=upstream REMOTE=upstream
REMOTE_BRANCH="$REMOTE/master" REMOTE_BRANCH="$REMOTE/master"
LOCAL_BRANCH="master"
# Makes sure you have a remote "upstream" that is up-to-date # Makes sure you have a remote "upstream" that is up-to-date
setup() { setup() {
ret=0 ret=0
@ -41,7 +39,7 @@ setup() {
} }
range() { range() {
RANGESTART_COMMIT=$(git merge-base "$REMOTE_BRANCH" master) RANGESTART_COMMIT=$(git merge-base "$REMOTE_BRANCH" "$LOCAL_BRANCH")
RANGEEND_COMMIT=$(git rev-parse "$REMOTE_BRANCH") RANGEEND_COMMIT=$(git rev-parse "$REMOTE_BRANCH")
if [ "$#" = 1 ]; then if [ "$#" = 1 ]; then
RANGEEND_COMMIT=$1 RANGEEND_COMMIT=$1
@ -57,18 +55,37 @@ range() {
esac esac
} }
# Process -b <branch> argument
while getopts "b:" opt; do
case $opt in
b)
LOCAL_BRANCH=$OPTARG
;;
\?)
echo "Invalid option: -$OPTARG" >&2
;;
esac
done
# Shift off the processed options
shift $((OPTIND -1))
if [ "$#" -lt 1 ]; then
help
fi
case $1 in case $1 in
range) range)
shift shift
setup setup
range "$@" range "$@"
REPRODUCE_COMMAND="$0 range $RANGEEND_COMMIT" REPRODUCE_COMMAND="$0 range -b $LOCAL_BRANCH $RANGEEND_COMMIT"
;; ;;
select) select)
shift shift
setup setup
COMMITS=$* COMMITS=$*
REPRODUCE_COMMAND="$0 select $@" REPRODUCE_COMMAND="$0 select -b $LOCAL_BRANCH $@"
;; ;;
help) help)
help help
@ -96,7 +113,7 @@ echo "-----------------------------------"
echo "$BODY" echo "$BODY"
echo "-----------------------------------" echo "-----------------------------------"
# Create branch from PR commit and create PR # Create branch from PR commit and create PR
git checkout master git checkout "$LOCAL_BRANCH"
git pull --autostash git pull --autostash
git checkout -b temp-merge-"$PRNUM" git checkout -b temp-merge-"$PRNUM"
@ -115,7 +132,7 @@ cat <<EOT > "$FNAME"
#!/bin/sh #!/bin/sh
gh pr create -t '$TITLE' -b '$BODY' --web gh pr create -t '$TITLE' -b '$BODY' --web
# Remove temporary branch # Remove temporary branch
git checkout master git checkout "$LOCAL_BRANCH"
git branch -D temp-merge-"$PRNUM" git branch -D temp-merge-"$PRNUM"
EOT EOT
chmod +x "$FNAME" chmod +x "$FNAME"