Merge pull request #301 from jeschu1/add_config

Set config to useHttpPath=true
microsoft · Oct 1, 2018 · bc5da49 · bc5da49
2 parents 7989320 + 9d6ec53
commit bc5da49
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/GVFS/GVFS.Common/Git/GitConfigSetting.cs b/GVFS/GVFS.Common/Git/GitConfigSetting.cs
@@ -6,6 +6,7 @@ public class GitConfigSetting
     {
         public const string CoreVirtualizeObjectsName = "core.virtualizeobjects";
         public const string CoreVirtualFileSystemName = "core.virtualfilesystem";
+        public const string CredentialUseHttpPath = "credential.useHttpPath";
 
         public GitConfigSetting(string name, params string[] values)
         {

diff --git a/GVFS/GVFS.Common/Git/GitProcess.cs b/GVFS/GVFS.Common/Git/GitProcess.cs
@@ -112,7 +112,7 @@ public virtual bool TryGetCredentials(
             using (ITracer activity = tracer.StartActivity("TryGetCredentials", EventLevel.Informational))
             {
                 Result gitCredentialOutput = this.InvokeGitAgainstDotGitFolder(
-                    "credential fill",
+                    "-c " + GitConfigSetting.CredentialUseHttpPath + "=true credential fill",
                     stdin => stdin.Write("url=" + repoUrl + "\n\n"),
                     parseStdOutLine: null);
 

diff --git a/GVFS/GVFS.UnitTests/Git/GitAuthenticationTests.cs b/GVFS/GVFS.UnitTests/Git/GitAuthenticationTests.cs
@@ -194,7 +194,7 @@ private MockGitProcess GetGitProcess()
 
             int revocations = 0;
             gitProcess.SetExpectedCommandResult(
-                "credential fill",
+                "-c credential.useHttpPath=true credential fill",
                 () => new GitProcess.Result("username=username\r\npassword=password" + revocations + "\r\n", string.Empty, GitProcess.Result.SuccessCode));
 
             gitProcess.SetExpectedCommandResult(

diff --git a/GVFS/GVFS/CommandLine/GVFSVerb.cs b/GVFS/GVFS/CommandLine/GVFSVerb.cs
@@ -92,6 +92,7 @@ public static bool TrySetRequiredGitConfigSettings(Enlistment enlistment)
                 { GitConfigSetting.CoreVirtualizeObjectsName, "true" },
                 { GitConfigSetting.CoreVirtualFileSystemName, Paths.ConvertPathToGitFormat(GVFSConstants.DotGit.Hooks.VirtualFileSystemPath) },
                 { "core.hookspath", expectedHooksPath },
+                { GitConfigSetting.CredentialUseHttpPath, "true" },
                 { "credential.validate", "false" },
                 { "diff.autoRefreshIndex", "false" },
                 { "gc.auto", "0" },