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 um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
40 [ "$um_files" ] && [ -f "../merge-files/akpm-current" ] && {
41 rm_files=$(grep -F "$um_files" "../merge-files/akpm-current")
43 "$bin_dir/do_rm" $rm_files
45 git diff 2>&1 | egrep -q '<<<<<|^\*' && {
48 GIT_EDITOR=: execute git commit -v -a
49 execute git diff -M --stat --summary 'HEAD^..'
51 printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $SHA1_FILE
53 [ -f "../merge-fixes/akpm-current" ] && {
54 for p in $(cat "../merge-fixes/akpm-current"); do
55 $(dirname $0)/merge_fix -n "$p" || {
61 new_head=$(git rev-parse HEAD)
64 [ "$old_head" = "$new_head" ] ||
65 [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
67 git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
68 echo git push failed 1>&2
71 "$bin_dir/do_build" || {
72 echo Build failed 1>&2
77 execute git clone -s -l -n -q . ../rebase-tmp || {
78 echo Clone failed 1>&2
81 log '$' cd ../rebase-tmp
83 execute git checkout -b akpm remotes/origin/akpm/master || {
84 echo Checkout of remotes/origin/akpm/master failed 1>&2
87 execute git rebase --onto master remotes/origin/akpm/master-base || {
88 echo Rebase failed 1>&2
92 notify-send "Waiting for akpm fix up"
93 pushover "Waiting for akpm fix up"
97 execute git fetch -f ../rebase-tmp akpm:akpm/master || {
98 echo Fetch of akpm/master failed 1>&2
101 execute rm -rf ../rebase-tmp
103 git branch -f akpm/master-base HEAD
105 old_head=$(git rev-parse HEAD)
106 log Merging akpm/master '('$(git log -1 --oneline akpm/master)')'
107 execute git merge --no-ff akpm/master || {
108 echo Merge failed 1>&2
111 printf "%s\t\t%s\n" akpm $(git show-ref --hash akpm/master) >> $SHA1_FILE
113 [ -f "../merge-fixes/akpm" ] && {
114 for p in $(cat "../merge-fixes/akpm"); do
115 $(dirname $0)/merge_fix -n "$p" || {
121 new_head=$(git rev-parse HEAD)
124 [ "$old_head" = "$new_head" ] ||
125 [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
127 git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
128 echo git push failed 1>&2
131 "$bin_dir/do_build" || {
132 echo Build failed 1>&2