3 today="$(date '+%Y%m%d')"
12 . "$(dirname $0)/common.sh"
16 echo "$@" | tee -a $LOG_FILE
22 $@ 2>&1 | tee -a $LOG_FILE
23 return ${PIPESTATUS[0]}
28 git branch -f akpm-current/current akpm/current
30 git branch -f akpm/base HEAD
32 old_head=$(git rev-parse HEAD)
33 hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
34 log Merging akpm-current/current "($hlog)"
35 execute git merge --no-ff akpm-current/current || {
36 echo Merge failed 1>&2
37 echo $h >>../merge.debug
38 git diff >>../merge.debug 2>&1
39 git diff 2>&1 | egrep -q '<<<<<|^\*' && {
42 GIT_EDITOR=: execute git commit -v -a
43 execute git diff -M --stat --summary 'HEAD^..'
45 printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $SHA1_FILE
47 [ -f "../merge-fixes/akpm-current" ] && {
48 for p in $(cat "../merge-fixes/akpm-current"); do
49 $(dirname $0)/merge_fix -n "$p" || {
55 new_head=$(git rev-parse HEAD)
58 [ "$old_head" = "$new_head" ] ||
59 [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
61 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
62 echo git push failed 1>&2
65 "$bin_dir/do_build" || {
66 echo Build failed 1>&2
71 execute git clone -s -l -n -q . ../rebase-tmp || {
72 echo Clone failed 1>&2
75 log '$' cd ../rebase-tmp
77 execute git checkout -b akpm remotes/origin/akpm/master || {
78 echo Checkout of remotes/origin/akpm/master failed 1>&2
81 execute git rebase --onto master remotes/origin/akpm/master-base || {
82 echo Rebase failed 1>&2
89 execute git fetch -f ../rebase-tmp akpm:akpm/master || {
90 echo Fetch of akpm/master failed 1>&2
93 execute rm -rf ../rebase-tmp
95 git branch -f akpm/master-base HEAD
97 old_head=$(git rev-parse HEAD)
98 log Merging akpm/master '('$(git log -1 --oneline akpm/master)')'
99 execute git merge --no-ff akpm/master || {
100 echo Merge failed 1>&2
103 printf "%s\t\t%s\n" akpm $(git show-ref --hash akpm/master) >> $SHA1_FILE
105 [ -f "../merge-fixes/akpm" ] && {
106 for p in $(cat "../merge-fixes/akpm"); do
107 $(dirname $0)/merge_fix -n "$p" || {
113 new_head=$(git rev-parse HEAD)
116 [ "$old_head" = "$new_head" ] ||
117 [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
119 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
120 echo git push failed 1>&2
123 "$bin_dir/do_build" || {
124 echo Build failed 1>&2