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

# Conflicts:
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs

Author: StanleyGoldman

src/GitHub.Api/Git/Tasks/GitStatusTask.cs

@@ -15,7 +15,7 @@ public GitStatusTask(IGitObjectFactory gitObjectFactory,
 
         public override string ProcessArguments
         {
-            get { return "-c i18n.logoutputencoding=utf8 -c core.quotepath=false status -b -u --ignored --porcelain"; }
+            get { return "-c i18n.logoutputencoding=utf8 -c core.quotepath=false status -b -u --porcelain"; }
         }
         public override TaskAffinity Affinity { get { return TaskAffinity.Exclusive; } }
     }

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

@@ -29,20 +29,29 @@ public override bool IsBusy
         public override void OnGUI()
         {
             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
@@ -57,7 +66,7 @@ public override void OnGUI()
                     gitExecPath = EditorGUILayout.TextField("Path to Git", gitExecPath);
                     if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
                     {
-                        var newValue = EditorUtility.OpenFilePanel(GitInstallBrowseTitle, gitInstallPath, extension);
+                        var newValue = EditorUtility.OpenFilePanel(GitInstallBrowseTitle, gitExecParentPath, extension);
 
                         if (!string.IsNullOrEmpty(newValue))
                         {