Merge branch 'fixes/git-path-file-browser' into enhancements/git-path-save-button

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs

@@ -688,20 +688,29 @@ private void OnGitLfsLocksGUI()
         private void OnInstallPathGUI()
         {
             string gitExecPath = null;
+            string gitExecParentPath = null;
+
             string extension = null;
-            string gitInstallPath = null;
+
             if (Environment != null)
             {
                 extension = Environment.ExecutableExtension;
+
                 if (Environment.IsWindows)
                 {
                     extension = extension.TrimStart('.');
                 }
 
-                gitInstallPath = Environment.GitInstallPath;
-
                 if (Environment.GitExecutablePath != null)
+                {
                     gitExecPath = Environment.GitExecutablePath.ToString();
+                    gitExecParentPath = Environment.GitExecutablePath.Parent.ToString();
+                }
+
+                if (gitExecParentPath == null)
+                {
+                    gitExecParentPath = Environment.GitInstallPath;
+                }
             }
 
             // Install path
@@ -715,7 +724,7 @@ private void OnInstallPathGUI()
                     //TODO: Verify necessary value for a non Windows OS
                     Styles.PathField(ref gitExecPath,
                         () => EditorUtility.OpenFilePanel(GitInstallBrowseTitle,
-                            gitInstallPath,
+                            gitExecParentPath,
                             extension), ValidateGitInstall);
                 }
                 if (EditorGUI.EndChangeCheck())