From 45afc9ad275bda289393654c06520c3129e87665 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 3 Dec 2020 19:50:19 +0100 Subject: [PATCH] Fixed issue #3678: Remove deprecated git lfs clone option from clone dialog Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 2 +- src/Changelog.txt | 1 + src/Resources/TortoiseProcENG.rc | 2 +- src/TortoiseProc/CloneDlg.cpp | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 282a6ce17..dacb33ba8 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -9863,7 +9863,7 @@ msgid "Use .mailmap" msgstr "" #. Resource IDs: (IDS_PROC_USELFS_TT) -msgid "Use Git LFS" +msgid "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" msgstr "" #. Resource IDs: (Dialog IDD_SETTINGSCREDENTIAL: Control id 1761) diff --git a/src/Changelog.txt b/src/Changelog.txt index 4fd629258..ecf27dade 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -19,6 +19,7 @@ Released: unreleased * Fixed issue #3662: LogDlg: The "Compare change sets" command is not shown when two commits are adjacent on the list * Fixed issue #3664: revert dialog in dark mode shows file list black * Fixed issue #3668: "Revert to revision" fails for added files + * Fixed issue #3678: Remove deprecated git lfs clone option from clone dialog = Release 2.11.0 = Released: 2020-10-10 diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index a1abd8403..d223d9663 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -3826,7 +3826,7 @@ BEGIN IDS_BROWSE_REFS_ONLYMERGED "Only merged (to HEAD)" IDS_BROWSE_REFS_ONLYUNMERGED "Only unmerged (to HEAD)" IDS_ARCHIVEFILEFILTER "ZIP archive (*.zip)|*.zip|TAR archive (*.tar)|*.tar|TAR GZIP archive (*.tar.gz)|*.tar.gz|All Files (*.*)|*.*||" - IDS_PROC_USELFS_TT "Use Git LFS" + IDS_PROC_USELFS_TT "Use Git LFS (only required for Git < 2.15 and Git LFS < 2.3)" IDS_EXTRAPATH_TT "If your git installation needs an extra entry in the PATH environment variable, you can enter it here and it will get appended to %PATH% automatically when TortoiseGit starts." IDS_FIRSTSTART_HINT1 "TortoiseGit is designed as a Shell Extension. Therefore the main interaction with TortoiseGit will be using the context menu of the Windows shell such as the Windows Explorer." IDS_FIRSTSTART_HINT2 "This is the First Start Wizard which will help you configure the basic settings. TortoiseGit is highly configurable, so it is advisable that you have a look into its settings dialog. The settings dialog is reachable using the start menu or the context menu of the Windows Explorer: TortoiseGit -> Settings." diff --git a/src/TortoiseProc/CloneDlg.cpp b/src/TortoiseProc/CloneDlg.cpp index 07e52a3df..e000abf8e 100644 --- a/src/TortoiseProc/CloneDlg.cpp +++ b/src/TortoiseProc/CloneDlg.cpp @@ -196,6 +196,8 @@ BOOL CCloneDlg::OnInitDialog() EnableSaveRestore(L"CloneDlg"); + DialogEnableWindow(IDC_CHECK_LFS, g_Git.ms_LastMsysGitVersion < ConvertVersionToInt(2, 15, 0)); + OnBnClickedCheckSvn(); OnBnClickedCheckDepth(); OnBnClickedCheckBranch(); @@ -434,7 +436,7 @@ void CCloneDlg::OnBnClickedCheckSvn() this->GetDlgItem(IDC_CHECK_BRANCH)->EnableWindow(!m_bSVN); this->GetDlgItem(IDC_EDIT_BRANCH)->EnableWindow(!m_bSVN); this->GetDlgItem(IDC_CHECK_NOCHECKOUT)->EnableWindow(!m_bSVN); - this->GetDlgItem(IDC_CHECK_LFS)->EnableWindow(!m_bSVN); + this->GetDlgItem(IDC_CHECK_LFS)->EnableWindow(!m_bSVN && g_Git.ms_LastMsysGitVersion < ConvertVersionToInt(2, 15, 0)); OnBnClickedCheckSvnTrunk(); OnBnClickedCheckSvnTag(); OnBnClickedCheckSvnBranch(); -- 2.11.4.GIT