From 1ab538d3fd825e65463d9fc6a852bc25b0de24ab Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Thu, 9 Feb 2023 13:42:28 -0500
Subject: [PATCH] Restore trailing slash after `a` or `b`

---
 .../tools/incrementals/git_changelist_maven_extension/Main.java | 2 +-
 .../incrementals/git_changelist_maven_extension/MainTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-changelist-maven-extension/src/main/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/Main.java b/git-changelist-maven-extension/src/main/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/Main.java
index ed59155..e01b2de 100644
--- a/git-changelist-maven-extension/src/main/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/Main.java
+++ b/git-changelist-maven-extension/src/main/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/Main.java
@@ -173,7 +173,7 @@ public void afterSessionStart(MavenSession session) throws MavenExecutionExcepti
     }
 
     static String sanitize(String hash) {
-        return hash.replaceAll("[ab]", "$0_").replaceAll("_$", "");
+        return hash.replaceAll("[ab]", "$0_");
     }
 
     private static String summarize(RevCommit c) {
diff --git a/git-changelist-maven-extension/src/test/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/MainTest.java b/git-changelist-maven-extension/src/test/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/MainTest.java
index 1b97642..5bdfe5c 100644
--- a/git-changelist-maven-extension/src/test/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/MainTest.java
+++ b/git-changelist-maven-extension/src/test/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/MainTest.java
@@ -56,7 +56,7 @@ public class MainTest {
     @Test public void alphaBetaTrailing() {
         String hash = "852b473a2bcb";
         String sanitized = Main.sanitize(hash);
-        assertThat(hash + " has been sanitized to the expected format", sanitized, is("852b_473a_2b_cb"));
+        assertThat(hash + " has been sanitized to the expected format", sanitized, is("852b_473a_2b_cb_"));
         String canonical = new ComparableVersion(sanitized).getCanonical();
         for (String prerelease : PRERELEASE) {
             assertThat(sanitized + " treated as a prerelease", canonical, not(containsString(prerelease)));