do_merge: fix the branch name printed

diff --git a/do_merge b/do_merge
index 96310aa3338177a1371287e114f96a5104cc5fb3..47a14088cd2b89447b29c1bd83a3b3218e2cd190 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -134,7 +134,7 @@ for h in $heads; do
        fi
        log Merging "$h" "($hlog)"
        check_dups "$tree" HEAD "$h" | tee -a "$LOG_FILE"
-       msg=$(printf "Merge branch '%s' of %s" "$branch" "$(get_url "$tree")")
+       msg=$(printf "Merge branch '%s' of %s" "${branch:-$tree}" "$(get_url "$tree")")
        if ! execute git merge -m "$msg" "$h"; then
                echo Merge failed 1>&2
                echo "$h" >>../merge.debug