echo Merge failed 1>&2
echo $h >>../merge.debug
git diff >>../merge.debug 2>&1
+ um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
+ [ "$um_files" ] && [ -f "../merge-files/akpm-current" ] && {
+ rm_files=$(grep -F "$um_files" "../merge-files/akpm-current")
+ [ "$rm_files" ] &&
+ "$bin_dir/do_rm" $rm_files
+ }
git diff 2>&1 | egrep -q '<<<<<|^\*' && {
bash -i || exit
}
[ "$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
}
}
echo "fix up?"
notify-send "Waiting for akpm fix up"
+pushover "Waiting for akpm fix up"
bash -i
log '$' cd $cpwd
cd $cpwd
[ "$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
}