From 1aea1b199f261c95a769ef3a2722a1e6a64a6939 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sun, 7 Feb 2021 23:49:39 +0100 Subject: [PATCH] [dev.boringcrypto] misc/boring: support codereview.cfg in merge.sh Change-Id: I90f218cdfca6d9b86b1e8961b33fa2e63f799624 Reviewed-on: https://go-review.googlesource.com/c/go/+/290172 Trust: Filippo Valsorda Reviewed-by: Katie Hockman Reviewed-by: Roland Shoemaker --- misc/boring/merge.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/misc/boring/merge.sh b/misc/boring/merge.sh index 9e13e14800..b897a5ba66 100755 --- a/misc/boring/merge.sh +++ b/misc/boring/merge.sh @@ -19,12 +19,14 @@ git worktree add --track -b "$BRANCH" "$WORKTREE" "origin/$TARGET" cd "$WORKTREE" 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 +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 -- 2.50.0