Merge branch 'main' into fix-124

Author: isc-etamarch

CHANGELOG.md

@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added 'git push --force' in expert mode (#527)
 - Added environment awareness in configuration, and showing of environment name in UI (#124)
 
+### Fixed
+- Fixed display of other users' username in workspace view on Unix (#530)
+
 ## [2.6.0] - 2024-10-07
 
 ### Added

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

@@ -2570,7 +2570,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                     if (isForCurrentUser) {
                         addItemToFileList(fileList, indexStatus, workingTreeStatus, model, false);
                     } else {
-                        var otherUser = otherUserUncommittedItems[model.replace(/\//g, '\\')];
+                        var otherUser = otherUserUncommittedItems[model] || otherUserUncommittedItems[model.replace(/\//g, '\\')];
                         addItemToFileList(fileList, indexStatus, workingTreeStatus, model, true, otherUser);
                     }
 

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

@@ -2570,7 +2570,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                     if (isForCurrentUser) {
                         addItemToFileList(fileList, indexStatus, workingTreeStatus, model, false);
                     } else {
-                        var otherUser = otherUserUncommittedItems[model.replace(/\//g, '\\')];
+                        var otherUser = otherUserUncommittedItems[model] || otherUserUncommittedItems[model.replace(/\//g, '\\')];
                         addItemToFileList(fileList, indexStatus, workingTreeStatus, model, true, otherUser);
                     }