Merge pull request #566 from intersystems/issue-523

Fix GitUI branch regex

Author: isc-tleavitt

CHANGELOG.md

@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Force export of item if it has been modified (#354)
 - Production configuration page no longer closes Sync/WebUI when operations there change the production (#542)
 - Remove leading/trailing spaces from input to Configure() (#356)
+- Fix branches with special characters not showing in GitUI (#523)
 
 ## [2.6.0] - 2024-10-07
 

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -436,7 +436,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
             var cardDiv = $('<div class="card custom-card">').appendTo(accordionDiv)[0];
             if (id.indexOf("local-branches") > -1) {
                 // parses the output of git branch --verbose --verbose
-                var matches = /^\*?\s*([\w-\/]+)\s+([^\s]+)\s+(\[.*\])?.*/.exec(ref);
+                var matches = /^\*?\s*([\w-.@&_\/]+)\s+([^\s]+)\s+(\[.*\])?.*/.exec(ref);
                 if (!matches) {
                     continue;
                 }

git-webui/src/share/git-webui/webui/js/git-webui.js

@@ -436,7 +436,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
             var cardDiv = $('<div class="card custom-card">').appendTo(accordionDiv)[0];
             if (id.indexOf("local-branches") > -1) {
                 // parses the output of git branch --verbose --verbose
-                var matches = /^\*?\s*([\w-\/]+)\s+([^\s]+)\s+(\[.*\])?.*/.exec(ref);
+                var matches = /^\*?\s*([\w-.@&_\/]+)\s+([^\s]+)\s+(\[.*\])?.*/.exec(ref);
                 if (!matches) {
                     continue;
                 }