From 844679594b3238218165806275e5076860c322dc Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Wed, 19 Dec 2012 19:25:42 +0800 Subject: [PATCH] Clarify the meaning of git fetch --tags and tagopt=--tags. They means to download all tags only Signed-off-by: Sup Yut Sum --- Languages/Tortoise.pot | 4 ++++ doc/source/en/TortoiseGit/tsvn_dug/dug_pullfetch.xml | 2 +- src/Resources/TortoiseProcENG.rc | 1 + src/TortoiseProc/PullFetchDlg.cpp | 2 +- src/TortoiseProc/Settings/SettingGitRemote.cpp | 2 +- src/TortoiseProc/resource.h | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 8c8e01735..51f168f98 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -1606,6 +1606,10 @@ msgstr "" msgid "All Parents" msgstr "" +#. Resource IDs: (9690) +msgid "All tags only" +msgstr "" + #. Resource IDs: (1008) msgid "All your changes will be lost! Do you really want to reset all toolbars and menus?" msgstr "" diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_pullfetch.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_pullfetch.xml index c07438035..f9ccd0488 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_pullfetch.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_pullfetch.xml @@ -51,7 +51,7 @@ Manage Remotes to add or modify remote configuration. - Tags has three states: Checked: All tags are downloaded (--tags is passed to git), unchecked: No tags are downloaded (--no-tags is passed to git), and third state: use default behavior (based on remote .tagopt setting). + Tags has three states: Checked: Only all tags are downloaded but no branches are downloaded (--tags is passed to git), unchecked: No tags are downloaded (--no-tags is passed to git), and third state: use default behavior (based on remote .tagopt setting). You can find more information about PuTTY and using ssh-keys at . diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 50eaf7495..53d3780ae 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -2729,6 +2729,7 @@ BEGIN IDS_REVGRAPH_ERR_NOMEMORY "Not enough memory!\nTry reducing the size of the revision graph by either\ncollapsing nodes or reducing the zoom factor." IDS_PROC_RESET "Reset" + IDS_FETCH_TAGS_ONLY "All tags only" END STRINGTABLE diff --git a/src/TortoiseProc/PullFetchDlg.cpp b/src/TortoiseProc/PullFetchDlg.cpp index 252cb6a8f..1f000b37b 100644 --- a/src/TortoiseProc/PullFetchDlg.cpp +++ b/src/TortoiseProc/PullFetchDlg.cpp @@ -254,7 +254,7 @@ void CPullFetchDlg::OnCbnSelchangeRemote() if (tagopt == "--no-tags") tagopt = CString(MAKEINTRESOURCE(IDS_NONE)); else if (tagopt == "--tags") - tagopt = CString(MAKEINTRESOURCE(IDS_ALL)); + tagopt = CString(MAKEINTRESOURCE(IDS_FETCH_TAGS_ONLY)); else tagopt = CString(MAKEINTRESOURCE(IDS_FETCH_REACHABLE)); CString value; diff --git a/src/TortoiseProc/Settings/SettingGitRemote.cpp b/src/TortoiseProc/Settings/SettingGitRemote.cpp index d70e60887..8919a2fc7 100644 --- a/src/TortoiseProc/Settings/SettingGitRemote.cpp +++ b/src/TortoiseProc/Settings/SettingGitRemote.cpp @@ -91,7 +91,7 @@ BOOL CSettingGitRemote::OnInitDialog() m_ctrlTagOpt.AddString(CString(MAKEINTRESOURCE(IDS_FETCH_REACHABLE))); m_ctrlTagOpt.AddString(CString(MAKEINTRESOURCE(IDS_NONE))); - m_ctrlTagOpt.AddString(CString(MAKEINTRESOURCE(IDS_ALL))); + m_ctrlTagOpt.AddString(CString(MAKEINTRESOURCE(IDS_FETCH_TAGS_ONLY))); m_ctrlTagOpt.SetCurSel(0); //this->GetDlgItem(IDC_EDIT_REMOTE)->EnableWindow(FALSE); diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 5c6aed8ae..02ac8901c 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -1605,6 +1605,7 @@ #define IDS_FETCH_REACHABLE 9687 #define IDS_REVGRAPH_ERR_NOMEMORY 9688 #define IDS_PROC_RESET 9689 +#define IDS_FETCH_TAGS_ONLY 9690 #define ID_VIEW_ZOOMIN 32772 #define ID_VIEW_ZOOMOUT 32773 #define ID_VIEW_ZOOM100 32803 -- 2.11.4.GIT