From 3b99e99f437f12141423a8bfda6a5474dd80573a Mon Sep 17 00:00:00 2001 From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com> Date: Fri, 1 Mar 2024 12:59:12 -0500 Subject: [PATCH] fixed order of branches in diff to tell which modifications have been made --- cls/SourceControl/Git/Utils.cls | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls index ce66781d..777877e8 100644 --- a/cls/SourceControl/Git/Utils.cls +++ b/cls/SourceControl/Git/Utils.cls @@ -355,7 +355,7 @@ ClassMethod Pull(remote As %String = "origin", preview As %Boolean = 0) As %Stat write !, "Fetch done" write !, "Files that will be modified by git pull: " - do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("diff",,.errStream,.outStream, remote_"/"_branchName, "--name-status") + do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("diff",,.errStream,.outStream, branchName_".."_remote_"/"_branchName, "--name-status") while (outStream.AtEnd = 0) { set file = outStream.ReadLine() set modification = ##class(SourceControl.Git.Modification).%New() @@ -2036,3 +2036,4 @@ ClassMethod ResetSourceControlClass() } } +