From 709d48a7014d27ded0891bbcebb405d0ebbaa67c Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Jul 2024 12:34:11 +1000
Subject: [PATCH] dup_commit: cope with a different tree and multiple commits

---
 dup_commit | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/dup_commit b/dup_commit
index 75627b6..f18cea8 100755
--- a/dup_commit
+++ b/dup_commit
@@ -1,12 +1,24 @@
 #!/bin/bash
 
-subject="duplicate patches in the BRANCH tree"
-
 tools_dir=$(dirname "$0")
-"$tools_dir"/message_helper "$@" "$subject" <<EOF
-The following commits are also in Linus Torvalds' tree as different commits
-(but the same patches):
 
-EOF
+subject='duplicate patch in the BRANCH tree'
+obranch="Linus Torvalds'"
+
+if [ "X$1" = "X-o" ]; then
+	shift
+	obranch="the $1"
+	shift
+fi
+
+body="The following commit is also in $obranch tree as a different commit (but the same patch):"
+
+if [ "X$1" = "X-p" ]; then
+	shift
+	subject="duplicate patches in the BRANCH tree"
+	body="The following commits are also in $obranch tree as different commits (but the same patches):"
+fi
+
+printf '%s\n' "$body" | fmt | "$tools_dir"/message_helper "$@" "$subject"
 
 exit 0
-- 
2.39.5