From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Jan 2023 22:00:57 +0000 (+1100)
Subject: do_merge: add duplicates to the log file
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=bf4ff5430d789261b54a90fb0789f14e372cda5c;p=next-scripts

do_merge: add duplicates to the log file
---

diff --git a/do_merge b/do_merge
index 68ba9d7..b678993 100755
--- a/do_merge
+++ b/do_merge
@@ -90,7 +90,7 @@ for h in $heads; do
 		done 7<"../pre-merge/$tree"
 	fi
 	log Merging "$h" "($hlog)"
-	check_dups "$tree" HEAD "$h"
+	check_dups "$tree" HEAD "$h" | tee -a "$LOG_FILE"
 	msg=$(printf "Merge branch '%s' of %s" "${h#*/}" "$(get_url "$tree")")
 	if ! execute git merge -m "$msg" "$h"; then
 		echo Merge failed 1>&2