@@ -682,18 +682,18 @@ namespace GitUI public static bool SolveGitCmdDir() { + GitCommands.Settings.GitDir = GetRegistryValue(Registry.LocalMachine, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1", "InstallLocation") + "\\cmd\\"; if (string.IsNullOrEmpty(GitCommands.GitCommands.RunCmd(GitCommands.Settings.GitDir + "git.cmd", ""))) { - GitCommands.Settings.GitDir = GetRegistryValue(Registry.LocalMachine, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1", "InstallLocation") + "\\cmd\\"; + GitCommands.Settings.GitDir = @"c:\Program Files (x86)\Git\cmd\"; if (string.IsNullOrEmpty(GitCommands.GitCommands.RunCmd(GitCommands.Settings.GitDir + "git.cmd", ""))) { - GitCommands.Settings.GitDir = @"c:\Program Files (x86)\Git\cmd\"; + GitCommands.Settings.GitDir = @"c:\Program Files\Git\cmd\"; if (string.IsNullOrEmpty(GitCommands.GitCommands.RunCmd(GitCommands.Settings.GitDir + "git.cmd", ""))) { - GitCommands.Settings.GitDir = @"c:\Program Files\Git\cmd\"; + GitCommands.Settings.GitDir = ""; if (string.IsNullOrEmpty(GitCommands.GitCommands.RunCmd(GitCommands.Settings.GitDir + "git.cmd", ""))) { - GitCommands.Settings.GitDir = ""; return false; } } @@ -792,22 +792,22 @@ namespace GitUI public static bool SolveGitBinDir() { + GitCommands.Settings.GitBinDir = @"c:\Program Files\Git\bin\"; if (string.IsNullOrEmpty(GitCommands.GitCommands.RunCmd(GitCommands.Settings.GitBinDir + "git.exe", ""))) { - GitCommands.Settings.GitBinDir = @"c:\Program Files\Git\bin\"; + GitCommands.Settings.GitBinDir = @"c:\Program Files (x86)\Git\bin\"; if (string.IsNullOrEmpty(GitCommands.GitCommands.RunCmd(GitCommands.Settings.GitBinDir + "git.exe", ""))) { - GitCommands.Settings.GitBinDir = @"c:\Program Files (x86)\Git\bin\"; + GitCommands.Settings.GitBinDir = GitCommands.Settings.GitDir; + GitCommands.Settings.GitBinDir = GitCommands.Settings.GitBinDir.Replace("\\cmd\\", "\\bin\\"); if (string.IsNullOrEmpty(GitCommands.GitCommands.RunCmd(GitCommands.Settings.GitBinDir + "git.exe", ""))) { - GitCommands.Settings.GitBinDir = GitCommands.Settings.GitDir; - GitCommands.Settings.GitBinDir = GitCommands.Settings.GitBinDir.Replace("\\cmd\\", "\\bin\\"); + GitCommands.Settings.GitBinDir = GetRegistryValue(Registry.LocalMachine, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1", "InstallLocation") + "\\bin\\"; if (string.IsNullOrEmpty(GitCommands.GitCommands.RunCmd(GitCommands.Settings.GitBinDir + "git.exe", ""))) { - GitCommands.Settings.GitBinDir = GetRegistryValue(Registry.LocalMachine, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1", "InstallLocation") + "\\bin\\"; - if (string.IsNullOrEmpty(GitCommands.GitCommands.RunCmd(GitCommands.Settings.GitBinDir + "git.exe", ""))) + GitCommands.Settings.GitBinDir = ""; + if (string.IsNullOrEmpty(GitCommands.GitCommands.RunCmd(GitCommands.Settings.GitDir + "git.exe", ""))) { - GitCommands.Settings.GitBinDir = ""; return false; } } GitUI/FormSettings.cs cf8f6aecd807b370b7e444a1e86133e659c14c19 Henk Westhuis Henk_Westhuis@hotmail.com http://github.com/spdr870/gitextensions/commit/7851f2fbca3c244220c05dba518e94754944cce3 7851f2fbca3c244220c05dba518e94754944cce3 2009-11-04T10:18:34-08:00 2009-11-04T10:18:34-08:00 Minor change in auto resolve git dir functions. 3d1d548f505cbcaf90f8d9f68d0b290bdaf549e2 Henk Westhuis Henk_Westhuis@hotmail.com