Merge pull request #744 from github-for-unity/fixes/configure-merge-settings-on-repo-init-too

Setting UnityYamlMerge options on repo initialization

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -165,26 +165,7 @@ public void SetupGit(GitInstaller.GitInstallationState state)
             {
                 if (Environment.RepositoryPath.IsInitialized)
                 {
-                    var unityYamlMergeExec = Environment.UnityApplicationContents.Combine("Tools", "UnityYAMLMerge" + Environment.ExecutableExtension);
-                    var yamlMergeCommand = Environment.IsWindows
-                        ? $@"'{unityYamlMergeExec}' merge -p ""$BASE"" ""$REMOTE"" ""$LOCAL"" ""$MERGED"""
-                        : $@"'{unityYamlMergeExec}' merge -p '$BASE' '$REMOTE' '$LOCAL' '$MERGED'";
-
-                    GitClient.SetConfig("merge.unityyamlmerge.cmd", yamlMergeCommand, GitConfigSource.Local)
-                        .Catch(e =>
-                        {
-                            Logger.Error(e, "Error setting merge.unityyamlmerge.cmd");
-                            return true;
-                        })
-                        .RunWithReturn(true);
-
-                    GitClient.SetConfig("merge.unityyamlmerge.trustExitCode", "false", GitConfigSource.Local)
-                        .Catch(e =>
-                        {
-                            Logger.Error(e, "Error setting merge.unityyamlmerge.trustExitCode");
-                            return true;
-                        })
-                        .RunWithReturn(true);
+                    ConfigureMergeSettings();
 
                     GitClient.LfsInstall()
                         .Catch(e =>
@@ -236,6 +217,8 @@ public void InitializeRepository()
                     var filesForInitialCommit = new List<string> { gitignore, gitAttrs, assetsGitignore };
 
                     GitClient.Init().RunWithReturn(true);
+
+                    ConfigureMergeSettings();
                     GitClient.LfsInstall().RunWithReturn(true);
                     AssemblyResources.ToFile(ResourceType.Generic, ".gitignore", targetPath, Environment);
                     AssemblyResources.ToFile(ResourceType.Generic, ".gitattributes", targetPath, Environment);
@@ -261,6 +244,25 @@ public void InitializeRepository()
             thread.Start();
         }
 
+        private void ConfigureMergeSettings()
+        {
+            var unityYamlMergeExec =
+                Environment.UnityApplicationContents.Combine("Tools", "UnityYAMLMerge" + Environment.ExecutableExtension);
+            var yamlMergeCommand = Environment.IsWindows
+                ? $@"'{unityYamlMergeExec}' merge -p ""$BASE"" ""$REMOTE"" ""$LOCAL"" ""$MERGED"""
+                : $@"'{unityYamlMergeExec}' merge -p '$BASE' '$REMOTE' '$LOCAL' '$MERGED'";
+
+            GitClient.SetConfig("merge.unityyamlmerge.cmd", yamlMergeCommand, GitConfigSource.Local).Catch(e => {
+                Logger.Error(e, "Error setting merge.unityyamlmerge.cmd");
+                return true;
+            }).RunWithReturn(true);
+
+            GitClient.SetConfig("merge.unityyamlmerge.trustExitCode", "false", GitConfigSource.Local).Catch(e => {
+                Logger.Error(e, "Error setting merge.unityyamlmerge.trustExitCode");
+                return true;
+            }).RunWithReturn(true);
+        }
+
         public void RestartRepository()
         {
             if (!Environment.RepositoryPath.IsInitialized)