X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=do_merge;fp=do_merge;h=1668493d51fdd9c366ec8340276ceba022552b09;hb=b09c5f14b029621ad031d930aa8a91a8bd1b5d51;hp=ec55df978936098261efb35508a21f6bd13bb067;hpb=6c864e0c6144f7ae6b84c14186350a712512f74f;p=next-scripts

diff --git a/do_merge b/do_merge
index ec55df9..1668493 100755
--- 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