From 16b135cae98a0d3c9d6050783a6fb1deb3fae9b5 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 5 Nov 2021 00:09:51 +0100
Subject: scripts/release-notes.pl: use out of repo links verbatim in refs

---
 scripts/release-notes.pl | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

(limited to 'scripts/release-notes.pl')

diff --git a/scripts/release-notes.pl b/scripts/release-notes.pl
index d52c2554c..4260c5995 100755
--- a/scripts/release-notes.pl
+++ b/scripts/release-notes.pl
@@ -82,6 +82,27 @@ sub getref {
     return $#refs + 1;
 }
 
+# '#num'
+# 'num'
+# 'https://github.com/curl/curl/issues/6939'
+# 'https://github.com/curl/curl-www/issues/69'
+
+sub extract {
+    my ($ref)=@_;
+    if($ref =~ /^(\#|)(\d+)/) {
+        # return the plain number
+        return $2;
+    }
+    elsif($ref =~ /^https:\/\/github.com\/curl\/curl\/.*\/(\d+)/) {
+        # return the plain number
+        return $2;
+    }
+    else {
+        # return the URL
+        return $ref;
+    }
+}
+
 my $short;
 my $first;
 for my $l (@gitlog) {
@@ -107,14 +128,14 @@ for my $l (@gitlog) {
         # not the first
         my $line = $1;
 
-        if($line =~ /^Fixes(:|) .*[^0-9](\d+)/i) {
-            push @fixes, $2;
+        if($line =~ /^Fixes(:|) *(.*)/i) {
+            push @fixes, extract($2);
         }
-        elsif($line =~ /^Clo(s|)es(:|) .*[^0-9](\d+)/i) {
-            push @closes, $3;
+        elsif($line =~ /^Clo(s|)es(:|) *(.*)/i) {
+            push @closes, extract($3);
         }
         elsif($line =~ /^Bug: (.*)/i) {
-            push @bug, $1;
+            push @bug, extract($1);
         }
     }
 }
-- 
cgit v1.2.1