mirror of
https://github.com/golang/go
synced 2024-11-22 22:10:03 -07:00
1aea1b199f
Change-Id: I90f218cdfca6d9b86b1e8961b33fa2e63f799624 Reviewed-on: https://go-review.googlesource.com/c/go/+/290172 Trust: Filippo Valsorda <filippo@golang.org> Reviewed-by: Katie Hockman <katie@golang.org> Reviewed-by: Roland Shoemaker <roland@golang.org>
35 lines
1.0 KiB
Bash
Executable File
35 lines
1.0 KiB
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
|
|
|
|
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 --no-commit --no-stat "$SOURCE" || echo "Ignoring conflict..."
|
|
[[ -f VERSION ]] && git rm -f VERSION
|
|
git checkout --ours codereview.cfg && git add codereview.cfg
|
|
git commit -m "all: merge $SOURCE into $TARGET"
|
|
|
|
if ! git log --format=%B -n 1 | grep "\[$TARGET\] "; then
|
|
echo "The commit does not seem to be targeting the BoringCrypto branch."
|
|
echo "(Or you are missing the git-codereview hooks.)"
|
|
exit 1
|
|
fi
|
|
|
|
git codereview mail -r katie@golang.org,roland@golang.org,filippo@golang.org -trybot -trust HEAD
|
|
cd - && git worktree remove "$WORKTREE"
|