commit dabc8ff9342f29147903347f4dde6e6a05a9543d
author Austin Schuh <austin.linux@gmail.com> Sat Nov 06 14:59:22 2021 -0700
committer Gerrit Code Review <gerrit@software.frc971.org> Sat Nov 06 14:59:22 2021 -0700
tree 6074d8c46249c288075f987b8973dfe163944a06
parent c7b7b2ff0c2553086eec6e6074178a1360cabf17
parent 357b643cdf2c6a1de9e6f745570d340f123d6fae

Merge "Automatically sign off commits when rewriting for gerrit"

third_party/rewrite_subtree.sh

diff --git a/third_party/rewrite_subtree.sh b/third_party/rewrite_subtree.sh
index a3e5372..e565d2b 100755
--- a/third_party/rewrite_subtree.sh
+++ b/third_party/rewrite_subtree.sh
@@ -13,11 +13,13 @@
 set -e
 set -o pipefail
 
+export SIGNOFF="Signed-off-by: $(git config --get user.name) <$(git config --get user.email)>"
+
 GIT_DIR=$(readlink -f "$(git rev-parse --git-dir)")
 TMP_MSG="${GIT_DIR}/COMMIT_MSG_REWRITE"
 
-git filter-branch --msg-filter \
-  "cat > ${TMP_MSG} && \"${GIT_DIR}/hooks/commit-msg\" ${TMP_MSG} && \
+git filter-branch -f --msg-filter \
+  "cat | git interpret-trailers --trailer \"$SIGNOFF\" > ${TMP_MSG} && \"${GIT_DIR}/hooks/commit-msg\" ${TMP_MSG} && \
   cat \"${TMP_MSG}\"" HEAD...HEAD~1
 
 rm -rf "${TMP_MSG}"