fix: rebasing from remote loads code changed on the remote

isc-pbarton · isc-pbarton · commit c58f2545de22 · 2024-10-01T11:53:18.000-04:00
we now diff the old head with the new head. before we diffed the remote branch with the new head, which misses all the changes made on the remote branch.
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -440,7 +440,7 @@ ClassMethod MergeDefaultRemoteBranch(Output alert As %String = "") As %Boolean
         do ..RunGitWithArgs(.errStream, .outStream, "fetch", "origin", defaultMergeBranch_":"_defaultMergeBranch)
         do ..PrintStreams(errStream, outStream)
 
-        do ..RunGitWithArgs(,.outStream, "rev-parse", defaultMergeBranch)
+        do ..RunGitWithArgs(,.outStream, "rev-parse", "HEAD")
         set startSha = outStream.ReadLine()
 
         // Start a transaction so code changes can be rolled back
@@ -2693,4 +2693,3 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
 }
 
 }
-

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ ClassMethod MergeDefaultRemoteBranch(Output alert As %String = "") As %Boolean`
`440`	`440`	`do ..RunGitWithArgs(.errStream, .outStream, "fetch", "origin", defaultMergeBranch_":"_defaultMergeBranch)`
`441`	`441`	`do ..PrintStreams(errStream, outStream)`
`442`	`442`
`443`		`- do ..RunGitWithArgs(,.outStream, "rev-parse", defaultMergeBranch)`
	`443`	`+ do ..RunGitWithArgs(,.outStream, "rev-parse", "HEAD")`
`444`	`444`	`set startSha = outStream.ReadLine()`
`445`	`445`
`446`	`446`	`// Start a transaction so code changes can be rolled back`
`@@ -2693,4 +2693,3 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status`
`2693`	`2693`	`}`
`2694`	`2694`
`2695`	`2695`	`}`
`2696`		`-`