hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
log Merging $h "($hlog)"
old_head=$(git rev-parse HEAD)
- [ -x "../pre-merge/$tree" ] && {
- "../pre-merge/$tree" || bash -i || exit
- }
case "$h" in
*:*)
do_rebase $h $tree
tab="\t"
[ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
printf "%s$tab%s\n" $tree $(git show-ref --hash "${h/\/*://}") >> $SHA1_FILE
- [ -x "../pre-build/$tree" ] && {
- "../pre-build/$tree" || bash -i || exit
- }
$no_build && continue
$need_build || {
# See if we need to build after merging this tree