3 LOG_FILE="../merge.log"
5 build_dir="/scratch/sfr/next"
6 build_cmd="bin/build_next"
8 today="$(date '+%Y%m%d')"
11 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
12 [ "$NEXT_BUILD_DIR" ] && build_host="$NEXT_BUILD_DIR"
29 echo "$@" | tee -a $LOG_FILE
35 $@ 2>&1 | tee -a $LOG_FILE
36 return ${PIPESTATUS[0]}
41 git update-ref "refs/next/$today/akpm-current" akpm/current
42 git branch -f akpm-current/current akpm/current
44 git branch -f akpm/base HEAD
46 hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
47 log Merging akpm-current/current "($hlog)"
48 execute git merge akpm-current/current || {
49 echo Merge failed 1>&2
50 echo $h >>../merge.debug
51 git diff >>../merge.debug 2>&1
52 git diff 2>&1 | egrep -q '<<<<<|^\*' && {
55 GIT_EDITOR=: execute git commit -v -a
56 execute git diff -M --stat --summary 'HEAD^..'
59 execute git clone -s -l -n -q . ../rebase-tmp || {
60 echo Clone failed 1>&2
63 log '$' cd ../rebase-tmp
65 execute git checkout -b akpm remotes/origin/akpm/master || {
66 echo Checkout of remotes/origin/akpm/master failed 1>&2
69 execute git rebase --onto master remotes/origin/akpm/master-base || {
70 echo Rebase failed 1>&2
77 execute git fetch -f ../rebase-tmp akpm:akpm/master || {
78 echo Fetch of akpm/master failed 1>&2
81 execute rm -rf ../rebase-tmp
83 git update-ref "refs/next/$today/akpm" akpm/master
85 git branch -f akpm/master-base HEAD
87 log Merging akpm/master '('$(git log -1 --oneline akpm/master)')'
88 execute git merge --no-ff akpm/master || {
89 echo Merge failed 1>&2
93 [ -f "../merge-fixes/akpm" ] && {
94 for p in $(cat "../merge-fixes/akpm"); do
95 $(dirname $0)/merge_fix -n "$p" || {
100 [ -x "../pre-build/akpm" ] && {
101 "../pre-build/akpm" || bash -i || exit
106 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
107 echo git push failed 1>&2
110 ssh "$build_host" "$build_cmd" || {
111 echo Build failed 1>&2