Merge branch 'main' into commit-encoding

intersystems · Nov 8, 2024 · a97f823 · a97f823
2 parents 4cb7803 + 659a268
commit a97f823
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fixed improper encoding of unicode characters in commit messages (#627)
+- Creating a new branch now reports the error if uncommitted changes conflict (#624)
 
 ## [2.7.0] - 2024-11-04
 

diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -395,11 +395,17 @@ ClassMethod NewBranch(newBranchName As %String) As %Status
 {
     set settings = ##class(SourceControl.Git.Settings).%New()
     if (settings.basicMode) && (settings.defaultMergeBranch '= ""){
-        do ..RunGitWithArgs(.errStream, .outStream, "checkout", settings.defaultMergeBranch)
+        set err = ..RunGitWithArgs(.errStream, .outStream, "checkout", settings.defaultMergeBranch)
         do ..PrintStreams(errStream, outStream)
+        if (err) {
+            quit $$$ERROR($$$GeneralError,errStream.Read()_$c(10)_"Current branch is: "_..GetCurrentBranch())
+        }
         kill errStream, outStream
-        do ..RunGitWithArgs(.errStream, .outStream, "pull")
+        set err = ..RunGitWithArgs(.errStream, .outStream, "pull")
         do ..PrintStreams(errStream, outStream)
+        if (err) {
+            quit $$$ERROR($$$GeneralError,errStream.Read()_$c(10)_"Current branch is: "_..GetCurrentBranch())
+        }
         kill errStream, outStream
     }
 
@@ -2938,3 +2944,4 @@ ClassMethod InDefaultBranchBasicMode() As %Boolean
 }
 
 }
+