From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 7 Nov 2024 23:09:51 +0000 (+1100)
Subject: do_merge: fix the branch name printed
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=6449875b5b673d3cc4df0daa055cf66aeff4a12c;p=next-scripts

do_merge: fix the branch name printed
---

diff --git a/do_merge b/do_merge
index 96310aa..47a1408 100755
--- 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