#!/bin/bash no_build=false [ "$1" = "-n" ] && { shift no_build=true } . "$(dirname $0)/common.sh" log() { echo "$@" | tee -a $LOG_FILE } execute() { log "$" $@ $@ 2>&1 | tee -a $LOG_FILE return ${PIPESTATUS[0]} } cpwd=../next execute git clone -s -l -n -q . ../rebase-tmp || { echo Clone failed 1>&2 bash -i || exit } log '$' cd ../rebase-tmp cd ../rebase-tmp execute git checkout -b init remotes/origin/init/master || { echo Checkout of remotes/origin/init/master failed 1>&2 bash -i || exit } execute git rebase --onto master remotes/origin/init/master-base || { echo Rebase failed 1>&2 bash -i || exit } echo "fix up?" bash -i log '$' cd $cpwd cd $cpwd execute git fetch -f ../rebase-tmp init:init/master || { echo Fetch of init/master failed 1>&2 bash -i || exit } execute rm -rf ../rebase-tmp git branch -f init/master-base HEAD old_head=$(git rev-parse HEAD) log Merging init/master '('$(git log -1 --oneline init/master)')' execute git merge --no-ff init/master || { echo Merge failed 1>&2 bash -i || exit } printf "%s\t\t%s\n" init $(git show-ref --hash init/master) >> $SHA1_FILE [ -f "../merge-fixes/init" ] && { for p in $(cat "../merge-fixes/init"); do $(dirname $0)/merge_fix -n "$p" || { bash -i || exit } done } new_head=$(git rev-parse HEAD) $no_build || [ "$old_head" = "$new_head" ] || [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || { git push -f "$build_host":"$build_dir" master:refs/heads/next || { echo git push failed 1>&2 bash -i || exit } "$bin_dir/do_build" || { echo Build failed 1>&2 bash -i || exit } } exit 0