From 7f292fc7d04cc68ece7f164ef11527756396a942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?fn=20=E2=8C=83=20=E2=8C=A5?=
 <70830482+FnControlOption@users.noreply.github.com>
Date: Mon, 8 Nov 2021 10:07:27 -0800
Subject: [PATCH] bump-cask-pr: use version substring before comma unless they
 match

---
 Library/Homebrew/dev-cmd/bump-cask-pr.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Library/Homebrew/dev-cmd/bump-cask-pr.rb b/Library/Homebrew/dev-cmd/bump-cask-pr.rb
index a533cbe132..036450f0e1 100644
--- a/Library/Homebrew/dev-cmd/bump-cask-pr.rb
+++ b/Library/Homebrew/dev-cmd/bump-cask-pr.rb
@@ -173,6 +173,10 @@ module Homebrew
     branch_name = "bump-#{cask.token}"
     commit_message = "Update #{cask.token}"
     if new_version.present?
+      if new_version.before_comma != old_version.before_comma
+        new_version = new_version.before_comma
+        old_version = old_version.before_comma
+      end
       branch_name += "-#{new_version.tr(",:", "-")}"
       commit_message += " from #{old_version} to #{new_version}"
     end