Merge SetConfigSearchPath and SetConfigSearchPaths.

Replace SetConfigSearchPath(level, string) and
SetConfigSearchPaths(level, IEnumerable<string>) with a single function
SetConfigSearchPaths(level, params string[]).

Using params allows this to take one or more string arguments as well as
accepting null to reset the paths (overloading the call to take parameters of
either string or IEnumerable would have made null an ambiguous argument).

Author: Ryan Roden-Corrent

LibGit2Sharp.Tests/ConfigurationFixture.cs

@@ -417,18 +417,18 @@ public void CanSetAndGetSearchPath()
             string systemPath = Path.Combine(Constants.TemporaryReposPath, Path.GetRandomFileName());
             string xdgPath    = Path.Combine(Constants.TemporaryReposPath, Path.GetRandomFileName());
 
-            GlobalSettings.SetConfigSearchPath(ConfigurationLevel.Global, globalPath);
-            GlobalSettings.SetConfigSearchPath(ConfigurationLevel.System, systemPath);
-            GlobalSettings.SetConfigSearchPath(ConfigurationLevel.Xdg,    xdgPath);
+            GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, globalPath);
+            GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.System, systemPath);
+            GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Xdg,    xdgPath);
 
             Assert.Equal(globalPath, GlobalSettings.GetConfigSearchPaths(ConfigurationLevel.Global).Single());
             Assert.Equal(systemPath, GlobalSettings.GetConfigSearchPaths(ConfigurationLevel.System).Single());
             Assert.Equal(xdgPath,    GlobalSettings.GetConfigSearchPaths(ConfigurationLevel.Xdg).Single());
 
             // reset the search paths to their defaults
-            GlobalSettings.SetConfigSearchPath(ConfigurationLevel.Global, null);
-            GlobalSettings.SetConfigSearchPath(ConfigurationLevel.System, null);
-            GlobalSettings.SetConfigSearchPath(ConfigurationLevel.Xdg,    null);
+            GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, null);
+            GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.System, null);
+            GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Xdg,    null);
         }
 
         [Fact]
@@ -477,7 +477,7 @@ public void CanRedirectConfigAccess()
             Touch(scd2.RootedDirectoryPath, ".gitconfig");
 
             // redirect global access to the first path
-            GlobalSettings.SetConfigSearchPath(ConfigurationLevel.Global, scd1.RootedDirectoryPath);
+            GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, scd1.RootedDirectoryPath);
 
             // set a value in the first config
             using (var config = Configuration.BuildFrom(null))
@@ -487,7 +487,7 @@ public void CanRedirectConfigAccess()
             }
 
             // redirect global config access to path2
-            GlobalSettings.SetConfigSearchPath(ConfigurationLevel.Global, scd2.RootedDirectoryPath);
+            GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, scd2.RootedDirectoryPath);
 
             // if the redirect succeeds, the value set in the prior config should not be visible
             using (var config = Configuration.BuildFrom(null))
@@ -496,7 +496,7 @@ public void CanRedirectConfigAccess()
             }
 
             // reset the search path to the default
-            GlobalSettings.SetConfigSearchPath(ConfigurationLevel.Global, null);
+            GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, null);
         }
     }
 }

LibGit2Sharp/GlobalSettings.cs

@@ -215,22 +215,12 @@ public static IEnumerable<string> GetConfigSearchPaths(ConfigurationLevel level)
             return Proxy.git_libgit2_opts_get_search_path(level).Split(Path.PathSeparator);
         }
 
-        /// <summary>
-        /// Set the path under which libgit2 searches for the configuration file of a given level.
-        /// </summary>
-        /// <param name="level">The level (global/system/XDG) of the config.</param>
-        /// <param name="path">The new search path, or null to reset to default.</param>
-        public static void SetConfigSearchPath(ConfigurationLevel level, string path)
-        {
-            Proxy.git_libgit2_opts_set_search_path(level, path);
-        }
-
         /// <summary>
         /// Set the paths under which libgit2 searches for the configuration file of a given level.
         /// </summary>
         /// <param name="level">The level (global/system/XDG) of the config.</param>
         /// <param name="paths">The new search paths, or null to reset to default.</param>
-        public static void SetConfigSearchPaths(ConfigurationLevel level, IEnumerable<string> paths)
+        public static void SetConfigSearchPaths(ConfigurationLevel level, params string[] paths)
         {
             var pathString = (paths == null) ? null : string.Join(Path.PathSeparator.ToString(), paths);
             Proxy.git_libgit2_opts_set_search_path(level, pathString);