do_merge: allow for pre merge actions

diff --git a/do_merge b/do_merge
index cb110ccfbb8a1878fdf4c1a89e9ba169e64f1f39..68f7f864f6585508cf56f4bd62e27138a4c45172 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -106,8 +106,15 @@ for h in $heads; do
        }
 
        hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
-       log Merging $h "($hlog)"
        old_head=$(git rev-parse HEAD)
+       [ -f "../pre-merge/$tree" ] && {
+               for p in $(cat "../pre-merge/$tree"); do
+                       "$bin_dir/do_patch" -n "$p" || {
+                               bash -i || exit
+                       }
+               done
+       }
+       log Merging $h "($hlog)"
        case "$h" in
        *:*)
                do_rebase $h $tree