Moving LFS the same way

StanleyGoldman · StanleyGoldman · commit 4dacb26907d3 · 2018-10-05T10:41:51.000-04:00
diff --git a/src/GitHub.Api/Installer/GitInstaller.cs b/src/GitHub.Api/Installer/GitInstaller.cs
@@ -317,6 +317,7 @@ private GitInstallationState ExtractGit(GitInstallationState state)
                     source.Delete();
 
                     state.GitIsValid = true;
+
                     state.IsCustomGitPath = state.GitExecutablePath != installDetails.GitExecutablePath;
                 }
             }
@@ -339,12 +340,15 @@ private GitInstallationState ExtractGit(GitInstallationState state)
                 {
                     Logger.Info("Moving GitLFS source:{0} target:{1}", source.ToString(), target.ToString());
 
-                    target.DeleteIfExists();
-                    target.EnsureParentDirectoryExists();
+                    Logger.Info("DeleteContents target:{0}", target.ToString());
+                    target.DeleteContents();
+
+                    Logger.Info("MoveFiles fromPath: {0} toPath:{1}", source.ToString(), target.ToString());
+                    source.MoveFiles(target, true);
 
-                    Logger.Info("GitLFS target Exists: {0}", target.Exists());
+                    Logger.Info("Delete source:{0}", source.ToString());
+                    source.Delete();
 
-                    source.Move(target);
                     state.GitLfsIsValid = true;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,7 @@ private GitInstallationState ExtractGit(GitInstallationState state)`
`317`	`317`	`source.Delete();`
`318`	`318`
`319`	`319`	`state.GitIsValid = true;`
	`320`	`+`
`320`	`321`	`state.IsCustomGitPath = state.GitExecutablePath != installDetails.GitExecutablePath;`
`321`	`322`	`}`
`322`	`323`	`}`
`@@ -339,12 +340,15 @@ private GitInstallationState ExtractGit(GitInstallationState state)`
`339`	`340`	`{`
`340`	`341`	`Logger.Info("Moving GitLFS source:{0} target:{1}", source.ToString(), target.ToString());`
`341`	`342`
`342`		`- target.DeleteIfExists();`
`343`		`- target.EnsureParentDirectoryExists();`
	`343`	`+ Logger.Info("DeleteContents target:{0}", target.ToString());`
	`344`	`+ target.DeleteContents();`
	`345`	`+`
	`346`	`+ Logger.Info("MoveFiles fromPath: {0} toPath:{1}", source.ToString(), target.ToString());`
	`347`	`+ source.MoveFiles(target, true);`
`344`	`348`
`345`		`- Logger.Info("GitLFS target Exists: {0}", target.Exists());`
	`349`	`+ Logger.Info("Delete source:{0}", source.ToString());`
	`350`	`+ source.Delete();`
`346`	`351`
`347`		`- source.Move(target);`
`348`	`352`	`state.GitLfsIsValid = true;`
`349`	`353`	`}`
`350`	`354`	`}`