1#!/bin/bash 2 3# update-marl merges the latest changes from the github.com/google/marl into 4# third_party/marl. This script copies the change descriptions from the squash 5# change into the top merge change, along with a standardized description. It 6# should be run from the top of the swiftshader directory, followed by 7# `git cl upload`. 8# 9# IMPORTANT NOTE: that git subtree doesn't play nicely with gerrit, so this script will 10# result in two separate CLs, the first of which will have a merge conflict. 11# You should force-submit the second (child) CL, ignoring the merge conflict on 12# the parent. Make sure you're up-to-date beforehand, to avoid the possibility 13# of a real merge conflict! 14REASON=$1 15 16if [ ! -z "$REASON" ]; then 17 REASON="\n$REASON\n" 18fi 19 20git subtree pull --prefix third_party/marl https://github.com/google/marl main --squash -m "Update marl" 21 22ALL_CHANGES=`git log -n 1 HEAD^2 | egrep '^(\s{4}[0-9a-f]{9}\s*.*)$'` 23HEAD_CHANGE=`echo "$ALL_CHANGES" | egrep '[0-9a-f]{9}' -o -m 1` 24LOG_MSG=`echo -e "Update Marl to $HEAD_CHANGE\n${REASON}\nChanges:\n$ALL_CHANGES\n\nCommands:\n ./third_party/update-marl.sh\n\nBug: b/140546382"` 25git commit --amend -m "$LOG_MSG" 26 27# Use filter-branch to apply the Gerrit commit hook to both CLs 28GIT_DIR=$(readlink -f "$(git rev-parse --git-dir)") 29TMP_MSG="${GIT_DIR}/COMMIT_MSG_REWRITE" 30FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f --msg-filter \ 31 "cat > ${TMP_MSG} && \"${GIT_DIR}/hooks/commit-msg\" ${TMP_MSG} && cat \"${TMP_MSG}\"" HEAD...HEAD~1 32rm -rf "${TMP_MSG}"