Making proxy change in GitProxyOptions struct instead of other classes

KashmiraDeshpande · KashmiraDeshpande · commit e6261a17a7b4 · 2019-06-20T14:45:28.000+05:30
diff --git a/LibGit2Sharp/Commands/Fetch.cs b/LibGit2Sharp/Commands/Fetch.cs
@@ -75,7 +75,7 @@ public static void Fetch(Repository repository, string remote, IEnumerable<strin
                     fetchOptions.CustomHeaders = GitStrArrayManaged.BuildFrom(options.CustomHeaders);
                 }
 
-                fetchOptions.ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };
+                fetchOptions.ProxyOptions = new GitProxyOptions { Version = 1};
 
                 Proxy.git_remote_fetch(remoteHandle, refspecs, fetchOptions, logMessage);
             }
diff --git a/LibGit2Sharp/Core/GitProxyOptions.cs b/LibGit2Sharp/Core/GitProxyOptions.cs
@@ -14,7 +14,7 @@ internal enum GitProxyType
     internal struct GitProxyOptions
     {
         public uint Version;
-        public GitProxyType Type;
+        public GitProxyType Type= GitProxyType.Auto;
         public IntPtr Url;
         public IntPtr CredentialsCb;
         public IntPtr CertificateCheck;
diff --git a/LibGit2Sharp/Network.cs b/LibGit2Sharp/Network.cs
@@ -118,7 +118,7 @@ private IEnumerable<Reference> ListReferencesInternal(string url, CredentialsHan
             using (RemoteHandle remoteHandle = BuildRemoteHandle(repository.Handle, url))
             {
                 GitRemoteCallbacks gitCallbacks = new GitRemoteCallbacks { version = 1 };
-                GitProxyOptions proxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };
+                GitProxyOptions proxyOptions = new GitProxyOptions { Version = 1 };
 
                 if (credentialsProvider != null)
                 {
@@ -375,7 +375,7 @@ public virtual void Push(Remote remote, IEnumerable<string> pushRefSpecs, PushOp
                                       {
                                           PackbuilderDegreeOfParallelism = pushOptions.PackbuilderDegreeOfParallelism,
                                           RemoteCallbacks = gitCallbacks,
-                                          ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto },
+                                          ProxyOptions = new GitProxyOptions { Version = 1 },
                                       });
             }
         }
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -678,7 +678,7 @@ public static IEnumerable<Reference> ListRemoteReferences(string url, Credential
             using (RemoteHandle remoteHandle = Proxy.git_remote_create_anonymous(repositoryHandle, url))
             {
                 var gitCallbacks = new GitRemoteCallbacks { version = 1 };
-                var proxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };
+                var proxyOptions = new GitProxyOptions { Version = 1 };
 
                 if (credentialsProvider != null)
                 {
@@ -768,7 +768,7 @@ public static string Clone(string sourceUrl, string workdirPath,
                 var gitCheckoutOptions = checkoutOptionsWrapper.Options;
 
                 var gitFetchOptions = fetchOptionsWrapper.Options;
-                gitFetchOptions.ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };
+                gitFetchOptions.ProxyOptions = new GitProxyOptions { Version = 1 };
                 gitFetchOptions.RemoteCallbacks = new RemoteCallbacks(options).GenerateCallbacks();
                 if (options.FetchOptions != null && options.FetchOptions.CustomHeaders != null)
                 {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public static void Fetch(Repository repository, string remote, IEnumerable<strin`
`75`	`75`	`fetchOptions.CustomHeaders = GitStrArrayManaged.BuildFrom(options.CustomHeaders);`
`76`	`76`	`}`
`77`	`77`
`78`		`- fetchOptions.ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };`
	`78`	`+ fetchOptions.ProxyOptions = new GitProxyOptions { Version = 1};`
`79`	`79`
`80`	`80`	`Proxy.git_remote_fetch(remoteHandle, refspecs, fetchOptions, logMessage);`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ internal enum GitProxyType`
`14`	`14`	`internal struct GitProxyOptions`
`15`	`15`	`{`
`16`	`16`	`public uint Version;`
`17`		`- public GitProxyType Type;`
	`17`	`+ public GitProxyType Type= GitProxyType.Auto;`
`18`	`18`	`public IntPtr Url;`
`19`	`19`	`public IntPtr CredentialsCb;`
`20`	`20`	`public IntPtr CertificateCheck;`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ private IEnumerable<Reference> ListReferencesInternal(string url, CredentialsHan`
`118`	`118`	`using (RemoteHandle remoteHandle = BuildRemoteHandle(repository.Handle, url))`
`119`	`119`	`{`
`120`	`120`	`GitRemoteCallbacks gitCallbacks = new GitRemoteCallbacks { version = 1 };`
`121`		`- GitProxyOptions proxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };`
	`121`	`+ GitProxyOptions proxyOptions = new GitProxyOptions { Version = 1 };`
`122`	`122`
`123`	`123`	`if (credentialsProvider != null)`
`124`	`124`	`{`
`@@ -375,7 +375,7 @@ public virtual void Push(Remote remote, IEnumerable<string> pushRefSpecs, PushOp`
`375`	`375`	`{`
`376`	`376`	`PackbuilderDegreeOfParallelism = pushOptions.PackbuilderDegreeOfParallelism,`
`377`	`377`	`RemoteCallbacks = gitCallbacks,`
`378`		`- ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto },`
	`378`	`+ ProxyOptions = new GitProxyOptions { Version = 1 },`
`379`	`379`	`});`
`380`	`380`	`}`
`381`	`381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ public static IEnumerable<Reference> ListRemoteReferences(string url, Credential`
`678`	`678`	`using (RemoteHandle remoteHandle = Proxy.git_remote_create_anonymous(repositoryHandle, url))`
`679`	`679`	`{`
`680`	`680`	`var gitCallbacks = new GitRemoteCallbacks { version = 1 };`
`681`		`- var proxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };`
	`681`	`+ var proxyOptions = new GitProxyOptions { Version = 1 };`
`682`	`682`
`683`	`683`	`if (credentialsProvider != null)`
`684`	`684`	`{`
`@@ -768,7 +768,7 @@ public static string Clone(string sourceUrl, string workdirPath,`
`768`	`768`	`var gitCheckoutOptions = checkoutOptionsWrapper.Options;`
`769`	`769`
`770`	`770`	`var gitFetchOptions = fetchOptionsWrapper.Options;`
`771`		`- gitFetchOptions.ProxyOptions = new GitProxyOptions { Version = 1, Type = GitProxyType.Auto };`
	`771`	`+ gitFetchOptions.ProxyOptions = new GitProxyOptions { Version = 1 };`
`772`	`772`	`gitFetchOptions.RemoteCallbacks = new RemoteCallbacks(options).GenerateCallbacks();`
`773`	`773`	`if (options.FetchOptions != null && options.FetchOptions.CustomHeaders != null)`
`774`	`774`	`{`