Skip to content

Diff view does not use --cached for unmerged changes #903

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
merged 2 commits into from
Nov 18, 2025
Merged

Diff view does not use --cached for unmerged changes #903

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
e07ef45
fix: diff view does not use --cached for unmerged changes
isc-pbarton Nov 14, 2025
284b5d3
fix: merge conflicts with deletes etc display as merge conflict too
isc-pbarton Nov 14, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Fixed
- Web UI workspace view labels changes as Merge Conflict if there are unmerged changes (#890)
- Web UI workspace view displays diff correctly for files with merge conflicts (#898)

## [2.14.0] - 2025-11-07

Expand Down
14 changes: 11 additions & 3 deletions 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 @@ -37,6 +37,9 @@ webui.COLORS = ["#ffab1d", "#fd8c25", "#f36e4a", "#fc6148", "#d75ab6", "#b25ade"
"#e47b07", "#e36920", "#d34e2a", "#ec3b24", "#ba3d99", "#9d45c9", "#4f5aec", "#615dcf", "#3286cf", "#00abca", "#279227", "#3a980c", "#6c7f00", "#ab8b0a", "#b56427", "#757575",
"#ff911a", "#fc8120", "#e7623e", "#fa5236", "#ca4da9", "#a74fd3", "#5a68ff", "#6d69db", "#489bd9", "#00bcde", "#36a436", "#47a519", "#798d0a", "#c1a120", "#bf7730", "#8e8e8e"]

webui.UNMERGED_STATUSES = ["DD","AU","UD","UA","DU","AA","UU"];
webui.STAGED_STATUSES = ["M","A","D","R","C"];

webui.peopleIcon = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-people-fill" viewBox="0 0 16 16">'+
'<path d="M7 14s-1 0-1-1 1-4 5-4 5 3 5 4-1 1-1 1H7zm4-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/>'+
'<path fill-rule="evenodd" d="M5.216 14A2.238 2.238 0 0 1 5 13c0-1.355.68-2.75 1.936-3.72A6.325 6.325 0 0 0 5 9c-4 0-5 3-5 4s1 1 1 1h4.216z"/>'+
Expand Down Expand Up @@ -2687,7 +2690,10 @@ webui.NewChangedFilesView = function(workspaceView) {
formCheck.attr("data-index-status", indexStatus);
formCheck.attr("data-working-tree-status", workingTreeStatus);

var displayStatus = (indexStatus == " ") ? workingTreeStatus : indexStatus;
var statusPair = (indexStatus || "") + (workingTreeStatus || "");
var displayStatus = (webui.UNMERGED_STATUSES.indexOf(statusPair) > -1) ? "U"
: (indexStatus == " ") ? workingTreeStatus
: indexStatus;

var checkboxInput;

Expand Down Expand Up @@ -3209,8 +3215,10 @@ webui.NewChangedFilesView = function(workspaceView) {
self.refreshDiff = function(element) {
self.fileToDiff = $(element).attr("data-filename");
var indexStatus = $(element).attr("data-index-status");
var workingTreeStatus = $(element).attr("data-working-tree-status");
var statusPair = (indexStatus || "") + (workingTreeStatus || "");
var gitOpts = [];
if (indexStatus != " ") {
if ((webui.STAGED_STATUSES.indexOf(indexStatus) > -1) && (webui.UNMERGED_STATUSES.indexOf(statusPair) == -1)) {
gitOpts.push("--cached");
}
workspaceView.diffView.update("diff", gitOpts, self.fileToDiff, "stage");
Expand Down Expand Up @@ -3434,4 +3442,4 @@ $(function () {
e.preventDefault();
location.reload()
});
});
});
14 changes: 11 additions & 3 deletions 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 @@ -37,6 +37,9 @@ webui.COLORS = ["#ffab1d", "#fd8c25", "#f36e4a", "#fc6148", "#d75ab6", "#b25ade"
"#e47b07", "#e36920", "#d34e2a", "#ec3b24", "#ba3d99", "#9d45c9", "#4f5aec", "#615dcf", "#3286cf", "#00abca", "#279227", "#3a980c", "#6c7f00", "#ab8b0a", "#b56427", "#757575",
"#ff911a", "#fc8120", "#e7623e", "#fa5236", "#ca4da9", "#a74fd3", "#5a68ff", "#6d69db", "#489bd9", "#00bcde", "#36a436", "#47a519", "#798d0a", "#c1a120", "#bf7730", "#8e8e8e"]

webui.UNMERGED_STATUSES = ["DD","AU","UD","UA","DU","AA","UU"];
webui.STAGED_STATUSES = ["M","A","D","R","C"];

webui.peopleIcon = '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-people-fill" viewBox="0 0 16 16">'+
'<path d="M7 14s-1 0-1-1 1-4 5-4 5 3 5 4-1 1-1 1H7zm4-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/>'+
'<path fill-rule="evenodd" d="M5.216 14A2.238 2.238 0 0 1 5 13c0-1.355.68-2.75 1.936-3.72A6.325 6.325 0 0 0 5 9c-4 0-5 3-5 4s1 1 1 1h4.216z"/>'+
Expand Down Expand Up @@ -2687,7 +2690,10 @@ webui.NewChangedFilesView = function(workspaceView) {
formCheck.attr("data-index-status", indexStatus);
formCheck.attr("data-working-tree-status", workingTreeStatus);

var displayStatus = (indexStatus == " ") ? workingTreeStatus : indexStatus;
var statusPair = (indexStatus || "") + (workingTreeStatus || "");
var displayStatus = (webui.UNMERGED_STATUSES.indexOf(statusPair) > -1) ? "U"
: (indexStatus == " ") ? workingTreeStatus
: indexStatus;

var checkboxInput;

Expand Down Expand Up @@ -3209,8 +3215,10 @@ webui.NewChangedFilesView = function(workspaceView) {
self.refreshDiff = function(element) {
self.fileToDiff = $(element).attr("data-filename");
var indexStatus = $(element).attr("data-index-status");
var workingTreeStatus = $(element).attr("data-working-tree-status");
var statusPair = (indexStatus || "") + (workingTreeStatus || "");
var gitOpts = [];
if (indexStatus != " ") {
if ((webui.STAGED_STATUSES.indexOf(indexStatus) > -1) && (webui.UNMERGED_STATUSES.indexOf(statusPair) == -1)) {
gitOpts.push("--cached");
}
workspaceView.diffView.update("diff", gitOpts, self.fileToDiff, "stage");
Expand Down Expand Up @@ -3434,4 +3442,4 @@ $(function () {
e.preventDefault();
location.reload()
});
});
});
Loading