mirror of
https://github.com/golang/go.git
synced 2025-05-07 00:23:03 +00:00
6eccf6a6cd
Change-Id: Id62b84b110af78e4ec8c34a8b71244027931b4f7 Reviewed-on: https://go-review.googlesource.com/c/go/+/182340 Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
33 lines
890 B
Bash
Executable File
33 lines
890 B
Bash
Executable File
#! /bin/bash
|
|
set -euo pipefail
|
|
|
|
if [ "$#" -ne 2 ]; then
|
|
echo "usage: merge.sh <target branch> <source revision>"
|
|
echo ""
|
|
echo "example: merge.sh dev.boringcrypto master"
|
|
echo " merge.sh dev.boringcrypto.go1.10 go1.10.7"
|
|
exit 1
|
|
fi
|
|
|
|
set -x
|
|
TARGET="$1"
|
|
SOURCE="$2"
|
|
WORKTREE="$(mktemp -d)"
|
|
BRANCH="boring/merge-$TARGET-$(date +%Y%m%d%H%M%S)"
|
|
|
|
git fetch
|
|
git worktree add --track -b "$BRANCH" "$WORKTREE" "origin/$TARGET"
|
|
|
|
cd "$WORKTREE"
|
|
export GIT_GOFMT_HOOK=off
|
|
git merge -m "all: merge $SOURCE into $TARGET" "$SOURCE" || \
|
|
(git rm VERSION && git commit -m "all: merge $SOURCE into $TARGET")
|
|
|
|
if ! git log --format=%B -n 1 | grep "\[dev.boringcrypto"; then
|
|
echo "The commit does not seem to be targeting a BoringCrypto branch."
|
|
exit 1
|
|
fi
|
|
|
|
git codereview mail -r dmitshur@golang.org,filippo@golang.org -trybot HEAD
|
|
cd - && git worktree remove "$WORKTREE"
|