From 4370acd2f01c21ddc051e456a0cbbc41a93cb8a1 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 30 May 2015 23:59:36 +0200 Subject: [PATCH] Fixed issue #2514: diff uses wrong tool in case the filename matches a registered extension Based on TortoiseSVN revision 22578. Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/AppUtils.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 51ee78ce3..fdea1f60f 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -14,6 +14,7 @@ Released: unreleased * Fixed issue #2153: Log window resize should expand commit list * Fixed issue #2509: Prompt for stash before rebase is not matched with pop stash after rebase * Fixed issue #2510: Non-correctly visualized settings dialog on modern high-DPI displays + * Fixed issue #2514: diff uses wrong tool in case the filename matches a registered extension = Release 1.8.14.0 = Released: 2015-04-08 diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index 396cfc01e..3a2b75c21 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -457,10 +457,10 @@ BOOL CAppUtils::StartExtPatch(const CTGitPath& patchfile, const CTGitPath& dir, CString CAppUtils::PickDiffTool(const CTGitPath& file1, const CTGitPath& file2) { - CString difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\.") + file2.GetFilename().MakeLower()); + CString difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + file2.GetFilename().MakeLower()); if (!difftool.IsEmpty()) return difftool; - difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\.") + file1.GetFilename().MakeLower()); + difftool = CRegString(_T("Software\\TortoiseGit\\DiffTools\\") + file1.GetFilename().MakeLower()); if (!difftool.IsEmpty()) return difftool; -- 2.11.4.GIT