From 7f7c6a28c06a5bfd67af340a007befdb362a427f Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 30 Dec 2013 18:31:51 +0100 Subject: [PATCH] Fixed issue #2053: Can't do "Combine to one commit"; changed file list wrongly empty Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/GitLogListAction.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/Changelog.txt b/src/Changelog.txt index 643a6a349..b51f47b4d 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -55,6 +55,7 @@ Released: Unreleased * Fixed issue #1866: Check for newer version of tgit behind proxy * Fixed issue #1927: Clicking on a hyperlinked commit hash leaves the target's log message un-hyperlinked * Fixed issue #1835: Question mark icons on committed unchanged files + * Fixed issue #2053: Can't do "Combine to one commit"; changed file list wrongly empty = Release 1.8.6.0 = Released: 2013-10-20 diff --git a/src/TortoiseProc/GitLogListAction.cpp b/src/TortoiseProc/GitLogListAction.cpp index f8c75390b..e41cd0d56 100644 --- a/src/TortoiseProc/GitLogListAction.cpp +++ b/src/TortoiseProc/GitLogListAction.cpp @@ -597,6 +597,9 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe dlg.m_bWholeProject=true; dlg.m_bSelectFilesForCommit = true; dlg.m_bForceCommitAmend=true; + CTGitPathList gpl; + gpl.AddPath(CTGitPath(g_Git.m_CurrentDir)); + dlg.m_pathList = gpl; if (lastRevision.ParentsCount() != 1) { CMessageBox::Show(NULL, _T("The following commit dialog can only show changes of oldest commit if it has exactly one parent. This is not the case right now."), _T("TortoiseGit"),MB_OK); -- 2.11.4.GIT