various fixes

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index f018bd137a9001f0454d2c47c0b92ceec924c53b..44b90d7f65ec86fff754377b1e0d52d1d268478c 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -37,8 +37,7 @@ for h in $heads; do
        execute git merge $h || {
                echo Merge failed 1>&2
                bash -i || exit
-               log '$' git commit -v -a
-               git commit -v -a
+               GIT_EDITOR=: execute git commit -v -a
                execute git diff -M --stat --summary 'HEAD^..'
        }
        new_head=$(git rev-parse HEAD)