make the merge messages more useful

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index ec55df978936098261efb35508a21f6bd13bb067..1668493d51fdd9c366ec8340276ceba022552b09 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -88,7 +88,8 @@ for h in $heads; do
                done 7<"../pre-merge/$tree"
        fi
        log Merging "$h" "($hlog)"
-       if ! execute git merge "$h"; then
+       printf -v msg "Merge branch '%s' of %s" "${h#*/}" "$(get_url "$tree")"
+       if ! execute git merge -m "$msg" "$h"; then
                echo Merge failed 1>&2
                echo "$h" >>../merge.debug
                git diff >>../merge.debug 2>&1