Skip to content

Commit d2d96a1

Browse files
authored
Merge pull request #432 from intersystems/fix-commit-diff-view
Fix commit diff view
2 parents 2f1bf57 + d924e24 commit d2d96a1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
12901290
if (cmd) {
12911291
self.gitCmd = cmd;
12921292
self.gitDiffOpts = diffOpts;
1293-
if (file != self.gitFile) {
1293+
if (file != self.gitFile && self.gitFile != '"undefined"') {
12941294
left.scrollTop = 0;
12951295
left.scrollLeft = 0;
12961296
right.scrollTop = 0;
@@ -1323,7 +1323,7 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
13231323
if (self.gitDiffOpts) {
13241324
fullCmd += " " + self.gitDiffOpts.join(" ")
13251325
}
1326-
if (self.gitFile) {
1326+
if (self.gitFile && self.gitFile != '"undefined"') {
13271327
fullCmd += self.noIndex + " -- " + self.gitFile;
13281328
}
13291329
webui.git(fullCmd, self.refresh, self.refresh, self.refresh);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
12901290
if (cmd) {
12911291
self.gitCmd = cmd;
12921292
self.gitDiffOpts = diffOpts;
1293-
if (file != self.gitFile) {
1293+
if (file != self.gitFile && self.gitFile != '"undefined"') {
12941294
left.scrollTop = 0;
12951295
left.scrollLeft = 0;
12961296
right.scrollTop = 0;
@@ -1323,7 +1323,7 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
13231323
if (self.gitDiffOpts) {
13241324
fullCmd += " " + self.gitDiffOpts.join(" ")
13251325
}
1326-
if (self.gitFile) {
1326+
if (self.gitFile && self.gitFile != '"undefined"') {
13271327
fullCmd += self.noIndex + " -- " + self.gitFile;
13281328
}
13291329
webui.git(fullCmd, self.refresh, self.refresh, self.refresh);

0 commit comments

Comments
 (0)