From 52b600928960cb975eb099d33046fbb98db0c67f Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Mon, 16 Mar 2020 18:33:44 +0000
Subject: [PATCH] Tweaked bin/mkpatch some for -c handling  - Legacy-Id: 17444

---
 bin/mkpatch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/mkpatch b/bin/mkpatch
index de1b0b407..072dbd762 100755
--- a/bin/mkpatch
+++ b/bin/mkpatch
@@ -106,7 +106,7 @@ done
 # The program itself
 
 if   [ "$CHG" ]; then
-  name=$(echo $(svn log -c $CHG | sed -r -e '/^---/d' -e '/^r[0-9]+/d' -e '/^$/d') | sed -r -e 's/(.*)/\L\1/' -e 's/[^[:alnum:]]/-/g' -e 's/-+/-/g' | cut -c 1-32)
+  name=$(echo $(svn log -c $CHG | sed -r -e '/^---/d' -e '/^r[0-9]+/d' -e '/^$/d' -e 's/Merged in \[[0-9]+\] from [^:]+..//' ) | sed -r -e 's/(.*)/\L\1/' -e 's/[^[:alnum:]]/-/g' -e 's/-+/-/g' | cut -c 1-40)
   name="$name-c$CHG"
 else
   if [ $# -lt 2 ]; then die "Expected patch name and file list on the command line."; fi