old_head=$(git rev-parse HEAD)
hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
log Merging akpm-current/current "($hlog)"
-execute git merge akpm-current/current || {
+execute git merge --no-ff akpm-current/current || {
echo Merge failed 1>&2
echo $h >>../merge.debug
git diff >>../merge.debug 2>&1
+
+ check_unmerged_files akpm-current
+
git diff 2>&1 | egrep -q '<<<<<|^\*' && {
bash -i || exit
}
}
done
}
-[ -x "../pre-build/akpm-current" ] && {
- "../pre-build/akpm-current" || bash -i || exit
-}
new_head=$(git rev-parse HEAD)
[ "$old_head" = "$new_head" ] ||
[ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
- git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+ git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
echo git push failed 1>&2
bash -i || exit
}
- "$bin_dir/do_build" || {
+ "$bin_dir/do_build" akpm-current || {
echo Build failed 1>&2
bash -i || exit
}
bash -i || exit
}
echo "fix up?"
+linux-next-notify "Waiting for akpm fix up"
bash -i
log '$' cd $cpwd
cd $cpwd
}
done
}
-[ -x "../pre-build/akpm" ] && {
- "../pre-build/akpm" || bash -i || exit
-}
new_head=$(git rev-parse HEAD)
[ "$old_head" = "$new_head" ] ||
[ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
- git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+ git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
echo git push failed 1>&2
bash -i || exit
}
- "$bin_dir/do_build" || {
+ "$bin_dir/do_build" akpm || {
echo Build failed 1>&2
bash -i || exit
}