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
}
done
}
-[ -x "../pre-build/akpm-current" ] && {
- "../pre-build/akpm-current" || bash -i || exit
-}
new_head=$(git rev-parse HEAD)
bash -i || exit
}
echo "fix up?"
+notify-send "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)