From ad6e40c61494ea795915d1737239562a2356834e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 25 Nov 2011 15:22:36 +0100 Subject: [PATCH] inherit filter from selected folder in explorer Signed-off-by: Sven Strickroth --- src/TortoiseProc/Commands/PrevDiffCommand.cpp | 1 + src/TortoiseProc/FileDiffDlg.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/TortoiseProc/Commands/PrevDiffCommand.cpp b/src/TortoiseProc/Commands/PrevDiffCommand.cpp index 50f43a764..295a136c2 100644 --- a/src/TortoiseProc/Commands/PrevDiffCommand.cpp +++ b/src/TortoiseProc/Commands/PrevDiffCommand.cpp @@ -36,6 +36,7 @@ bool PrevDiffCommand::Execute() dlg.m_strRev1 = GIT_REV_ZERO; dlg.m_strRev2 = _T("HEAD~1"); + dlg.m_sFilter = this->cmdLinePath.GetGitPathString(); //dlg.m_pathList = CTGitPathList(cmdLinePath); dlg.DoModal(); diff --git a/src/TortoiseProc/FileDiffDlg.h b/src/TortoiseProc/FileDiffDlg.h index afed9cc65..55f68a09a 100644 --- a/src/TortoiseProc/FileDiffDlg.h +++ b/src/TortoiseProc/FileDiffDlg.h @@ -148,7 +148,6 @@ private: CMenuButton m_cRev1Btn; CMenuButton m_cRev2Btn; CFilterEdit m_cFilter; - CString m_sFilter; CMFCButton m_SwitchButton; CColors m_colors; @@ -191,6 +190,7 @@ private: public: CString m_strRev1; CString m_strRev2; + CString m_sFilter; public: virtual BOOL DestroyWindow(); -- 2.11.4.GIT