Skip to content

Fix invalid regular expression in branch name special character check #972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isc-pbarton merged 2 commits into from
Jun 9, 2026
+20 −2
Merged

Fix invalid regular expression in branch name special character check #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
498885b
Fix invalid regular expression in branch name special character check
raymond-rebbeck Jun 4, 2026
3ed77b6
Check that the branch name pattern actually has a '^' prefix or '$' s…
raymond-rebbeck Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion git-webui/release/share/git-webui/webui/js/git-webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,9 +472,18 @@ webui.SideBarView = function(mainView, noEventHandlers) {
}
var cardDiv = $('<div class="card custom-card branch-card">').appendTo(accordionDiv)[0];
if (id.indexOf("local-branches") > -1) {
// Remove any '^' prefix or '$' suffix from the branch name regex
// So that it can be inserted into the middle of another regex below
var branchNamePattern = webui.branchNamePattern.source
if (branchNamePattern.substring(0, 1) == "^") {
branchNamePattern = branchNamePattern.substring(1, branchNamePattern.length)
}
if (branchNamePattern.substring(branchNamePattern.length-1, branchNamePattern.length) == "$") {
branchNamePattern = branchNamePattern.substring(0, branchNamePattern.length-1)
}
// parses the output of git branch --verbose --verbose
// only match branch names with supported characters (see webui.branchNamePattern)
var reMatchGitBranchOutput = new RegExp("^\*?\s*("+ webui.branchNamePattern.source +")\s+([^\s]+)\s+(\[.*\])?.*")
var reMatchGitBranchOutput = new RegExp("^\\*?\\s*("+ branchNamePattern +")\\s+([^\\s]+)\\s+(\\[.*\\])?.*")
var matches = reMatchGitBranchOutput.exec(ref);
if (!matches) {
$(cardDiv).remove();
Expand Down
11 changes: 10 additions & 1 deletion git-webui/src/share/git-webui/webui/js/git-webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,9 +472,18 @@ webui.SideBarView = function(mainView, noEventHandlers) {
}
var cardDiv = $('<div class="card custom-card branch-card">').appendTo(accordionDiv)[0];
if (id.indexOf("local-branches") > -1) {
// Remove any '^' prefix or '$' suffix from the branch name regex
// So that it can be inserted into the middle of another regex below
var branchNamePattern = webui.branchNamePattern.source
if (branchNamePattern.substring(0, 1) == "^") {
branchNamePattern = branchNamePattern.substring(1, branchNamePattern.length)
}
if (branchNamePattern.substring(branchNamePattern.length-1, branchNamePattern.length) == "$") {
branchNamePattern = branchNamePattern.substring(0, branchNamePattern.length-1)
}
// parses the output of git branch --verbose --verbose
// only match branch names with supported characters (see webui.branchNamePattern)
var reMatchGitBranchOutput = new RegExp("^\*?\s*("+ webui.branchNamePattern.source +")\s+([^\s]+)\s+(\[.*\])?.*")
var reMatchGitBranchOutput = new RegExp("^\\*?\\s*("+ branchNamePattern +")\\s+([^\\s]+)\\s+(\\[.*\\])?.*")
var matches = reMatchGitBranchOutput.exec(ref);
if (!matches) {
$(cardDiv).remove();
Expand Down
Loading