From: Filippo Valsorda <filippo@golang.org>
Date: Sun, 7 Feb 2021 22:49:39 +0000 (+0100)
Subject: [dev.boringcrypto] misc/boring: support codereview.cfg in merge.sh
X-Git-Tag: go1.19beta1~484^2~56
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1aea1b199f261c95a769ef3a2722a1e6a64a6939;p=gostls13.git

[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 <filippo@golang.org>
Reviewed-by: Katie Hockman <katie@golang.org>
Reviewed-by: Roland Shoemaker <roland@golang.org>
---

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