Merge pull request #506 from intersystems/fix-rebase-remote

isc-tleavitt · web-flow · commit 3cb50803fae5 · 2024-10-01T13:29:25.000-04:00
Rebasing from remote loads code changed on the remote
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Changed prompts in configure from 0/1 to no/yes (#461)
 - Added warnings when user is using incompatible git version (#488)
 - Fixed the back button navigation between WebUI and Settings page (#361)
+- Basic mode Sync operation now imports items changed on the remote merge branch (#506)
 
 ## [2.5.0] - 2024-09-24
 
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`		`-`