3 bin_dir="$(dirname $0)"
5 LOG_FILE="../merge.log"
8 build_dir="/scratch/sfr/next"
9 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
10 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
12 today="$(date '+%Y%m%d')"
29 export NEXT_BUILD_HOST="$build_host"
30 export NEXT_BUILD_DIR="$build_dir"
34 echo "$@" | tee -a $LOG_FILE
40 $@ 2>&1 | tee -a $LOG_FILE
41 return ${PIPESTATUS[0]}
46 git branch -f akpm-current/current akpm/current
48 git branch -f akpm/base HEAD
50 old_head=$(git rev-parse HEAD)
51 hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
52 log Merging akpm-current/current "($hlog)"
53 execute git merge akpm-current/current || {
54 echo Merge failed 1>&2
55 echo $h >>../merge.debug
56 git diff >>../merge.debug 2>&1
57 git diff 2>&1 | egrep -q '<<<<<|^\*' && {
60 GIT_EDITOR=: execute git commit -v -a
61 execute git diff -M --stat --summary 'HEAD^..'
63 printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $SHA1_FILE
65 [ -f "../merge-fixes/akpm-current" ] && {
66 for p in $(cat "../merge-fixes/akpm-current"); do
67 $(dirname $0)/merge_fix -n "$p" || {
72 [ -x "../pre-build/akpm-current" ] && {
73 "../pre-build/akpm-current" || bash -i || exit
76 new_head=$(git rev-parse HEAD)
79 [ "$old_head" = "$new_head" ] ||
80 [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
82 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
83 echo git push failed 1>&2
86 "$bin_dir/do_build" || {
87 echo Build failed 1>&2
92 execute git clone -s -l -n -q . ../rebase-tmp || {
93 echo Clone failed 1>&2
96 log '$' cd ../rebase-tmp
98 execute git checkout -b akpm remotes/origin/akpm/master || {
99 echo Checkout of remotes/origin/akpm/master failed 1>&2
102 execute git rebase --onto master remotes/origin/akpm/master-base || {
103 echo Rebase failed 1>&2
110 execute git fetch -f ../rebase-tmp akpm:akpm/master || {
111 echo Fetch of akpm/master failed 1>&2
114 execute rm -rf ../rebase-tmp
116 git branch -f akpm/master-base HEAD
118 old_head=$(git rev-parse HEAD)
119 log Merging akpm/master '('$(git log -1 --oneline akpm/master)')'
120 execute git merge --no-ff akpm/master || {
121 echo Merge failed 1>&2
124 printf "%s\t\t%s\n" akpm $(git show-ref --hash akpm/master) >> $SHA1_FILE
126 [ -f "../merge-fixes/akpm" ] && {
127 for p in $(cat "../merge-fixes/akpm"); do
128 $(dirname $0)/merge_fix -n "$p" || {
133 [ -x "../pre-build/akpm" ] && {
134 "../pre-build/akpm" || bash -i || exit
137 new_head=$(git rev-parse HEAD)
140 [ "$old_head" = "$new_head" ] ||
141 [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
143 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
144 echo git push failed 1>&2
147 "$bin_dir/do_build" || {
148 echo Build failed 1>&2