Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[dev.boringcrypto] misc/boring: support codereview.cfg in merge.sh

Browse source 
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>
This commit is contained in:
Filippo Valsorda 2021-02-07 23:49:39 +01:00
parent 0d34d85dee
commit 1aea1b199f
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
misc/boring/merge.sh
View file

@ -19,12 +19,14 @@ git worktree add --track -b "$BRANCH" "$WORKTREE" "origin/$TARGET"
cd "$WORKTREE" cd "$WORKTREE"
export GIT_GOFMT_HOOK=off export GIT_GOFMT_HOOK=off
git merge --no-commit "$SOURCE" || echo "Ignoring conflict..." git merge --no-commit --no-stat "$SOURCE" || echo "Ignoring conflict..."
[[ -f VERSION ]] && git rm -f VERSION [[ -f VERSION ]] && git rm -f VERSION
git checkout --ours codereview.cfg && git add codereview.cfg
git commit -m "all: merge $SOURCE into $TARGET" git commit -m "all: merge $SOURCE into $TARGET"
if ! git log --format=%B -n 1 | grep "\[$TARGET\] "; then if ! git log --format=%B -n 1 | grep "\[$TARGET\] "; then
echo "The commit does not seem to be targeting the BoringCrypto branch." echo "The commit does not seem to be targeting the BoringCrypto branch."
echo "(Or you are missing the git-codereview hooks.)"
exit 1 exit 1
fi fi