Skip to content

Commit d1020e4

Browse files
When performing a pull set diffBase so that the diff to sync files with IRIS is performed in the intended direction
Setting diffCompare previously had the unintended result of a '..' prefix being added to the git diff command which would result in the diff being performed in the reverse direction than intended, causing additions to be treated as deletions for example.
1 parent bda0474 commit d1020e4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

cls/SourceControl/Git/Utils.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1912,7 +1912,7 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
19121912
// Verbose output should not be required as pull already outputs a summary
19131913
set syncIrisWithDiffVerbose = 0
19141914
// The current revision, prior to the pull, will be compared against
1915-
set diffCompare = ..GetCurrentRevision()
1915+
set diffBase = ..GetCurrentRevision()
19161916
} elseif (command = "merge") || (command = "rebase") {
19171917
set syncIrisWithCommand = 1
19181918
if $data(args) && $data(args(args),diffCompare) {

0 commit comments

Comments
 (0)