Merge pull request #860 from intersystems/clone-settings

Cloning an existing repo with Configure overwrites settings from file

Author: isc-pbarton

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Option to lock/unlock namespace is now available on the settings page (#650)
 
+### Fixed
+- When cloning a repo with Configure, that repo's embedded-git-config file will overwrite previous settings (#819)
+
 ## [2.13.1] - 2025-09-16
 
 ### Fixed

cls/SourceControl/Git/Settings.cls

@@ -454,8 +454,13 @@ Method OnAfterConfigure() As %Boolean
             set workMgr = $System.WorkMgr.%New("")
             $$$ThrowOnError(workMgr.Queue("##class(SourceControl.Git.Utils).Clone",remote))
             $$$ThrowOnError(workMgr.WaitForComplete())
-            // export settings file without committing
-            $$$ThrowOnError(..SaveWithSourceControl())
+            if ##class(%File).Exists(##class(SourceControl.Git.Utils).FullExternalName(##class(SourceControl.Git.Settings.Document).#INTERNALNAME)) {
+                write !, "Importing Embedded Git settings from cloned repository:"
+                do ##class(SourceControl.Git.Utils).ImportItem(##class(SourceControl.Git.Settings.Document).#INTERNALNAME)
+            } else {
+                // export settings file without committing
+                $$$ThrowOnError(..SaveWithSourceControl())
+            }
 
             // Empty repo breaks Embedded Git, commit the settings file
             do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("log",,.errStream,.outStream)
@@ -523,4 +528,3 @@ Method SaveDefaults() As %Boolean
 }
 
 }
-