#!/usr/bin/env bash # Copyright 2016-2017 Luke Shumaker set -e branch=$(git name-rev --name-only HEAD) if [[ $branch == master ]]; then gitdir="$(git rev-parse --git-dir)" workdir="${gitdir}/pre-generated" exec 8>"${workdir}.lock" flock 8 rm -rf -- "$workdir" git worktree prune git branch -D pre-generated.tmp &>/dev/null || true unset GIT_INDEX_FILE git worktree add -b pre-generated.tmp "${gitdir}/pre-generated" master ( unset GIT_DIR GIT_WORK_TREE cd "$workdir" msg="$(git log -n1 master --pretty=format:%B)" export GIT_AUTHOR_NAME='Maker' export GIT_AUTHOR_EMAIL='maker@andrewdm.me' make -j1 echo '!/out/' >> .gitignore git add . git commit -m "make: $msg" git checkout pre-generated # Ensure it exists locally git pull --no-edit -s ours # Avoid conflicts # What we want is # # git merge --no-edit -s theirs pre-generated.tmp # # Unfortunately, there is no 'theirs' strategy; so we # have to switch branches and do it backward with the # 'ours' strategry, switch back, then merge the merge # commit. git checkout pre-generated.tmp git merge --no-edit -s ours pre-generated git checkout pre-generated git merge pre-generated.tmp git branch -d pre-generated.tmp ) rm -rf -- "$workdir" git worktree prune fi