From e5820cb56a0a0367b9db725c4ab7d6ee42f9b5a6 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 10 May 2018 10:15:18 +0200 Subject: [PATCH] Fixed issue #3197: Bad generated path while renaming file with changing folder Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/RenameDlg.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 4b9e079f5..fae82905c 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -17,6 +17,7 @@ Released: unreleased * Fixed issue #3202: Deletion of inactive branch inside not main working copy fails * Fixed issue #3200: Problem when adding files to a worktree which is based on a bare repo * Fixed issue #3201: Frequent TGitCache crashes + * Fixed issue #3197: Bad generated path while renaming file with changing folder = Release 2.6.0 = Released: 2018-02-17 diff --git a/src/TortoiseProc/RenameDlg.cpp b/src/TortoiseProc/RenameDlg.cpp index 7584c6201..0cf0efb19 100644 --- a/src/TortoiseProc/RenameDlg.cpp +++ b/src/TortoiseProc/RenameDlg.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2009, 2011-2013, 2015-2017 - TortoiseGit +// Copyright (C) 2008-2009, 2011-2013, 2015-2018 - TortoiseGit // Copyright (C) 2003-2011, 2013 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -162,6 +162,7 @@ void CRenameDlg::OnBnClickedButtonBrowseRef() return; } CString relPath; + m_sBaseDir.Replace(L"/", L"\\"); if (!PathRelativePathTo(CStrBuf(relPath, MAX_PATH), m_sBaseDir, FILE_ATTRIBUTE_DIRECTORY, path, FILE_ATTRIBUTE_DIRECTORY)) return; if (CStringUtils::StartsWith(relPath, L".\\")) -- 2.11.4.GIT