From c10caf46e2e734963f47a7123886065eaff22bea Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 8 Jan 2012 21:20:15 +0100 Subject: [PATCH] fixed editing of .git/config-file with separate-git-dir Signed-off-by: Sven Strickroth --- src/TortoiseProc/Settings/SettingGitConfig.cpp | 7 +++---- src/TortoiseProc/TortoiseProc.cpp | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/TortoiseProc/Settings/SettingGitConfig.cpp b/src/TortoiseProc/Settings/SettingGitConfig.cpp index 52066393a..4ecae4a92 100644 --- a/src/TortoiseProc/Settings/SettingGitConfig.cpp +++ b/src/TortoiseProc/Settings/SettingGitConfig.cpp @@ -238,10 +238,9 @@ void CSettingGitConfig::OnBnClickedEditglobalgitconfig() void CSettingGitConfig::OnBnClickedEditlocalgitconfig() { - CString path = g_Git.m_CurrentDir; - if (!g_GitAdminDir.IsBareRepo(g_Git.m_CurrentDir)) - path += _T("\\.git"); - path += _T("\\config"); + CString path; + g_GitAdminDir.GetAdminDirPath(g_Git.m_CurrentDir, path); + path += _T("config"); // use alternative editor because of LineEndings CAppUtils::LaunchAlternativeEditor(path); } diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp index b84af4df7..8744a4cd7 100644 --- a/src/TortoiseProc/TortoiseProc.cpp +++ b/src/TortoiseProc/TortoiseProc.cpp @@ -413,10 +413,9 @@ BOOL CTortoiseProcApp::InitInstance() if (choice == 1) { // open the config file with alternative editor - CString path = g_Git.m_CurrentDir; - if (!g_GitAdminDir.IsBareRepo(g_Git.m_CurrentDir)) - path += _T("\\.git"); - path += _T("\\config"); + CString path; + g_GitAdminDir.GetAdminDirPath(g_Git.m_CurrentDir, path); + path += _T("config"); CAppUtils::LaunchAlternativeEditor(path); } else if (choice == 2) -- 2.11.4.GIT