From 8e01183a82ac0e18f042bfc6c8879ef0687a29a8 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 4 Oct 2013 16:41:33 +0200 Subject: [PATCH] Fixed issue #1769: "Show Log" missing from context menu if "Shell Extended" and a file was Added but not committed Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/Git/GitStatus.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index defc15b6d..ff421364e 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -41,6 +41,7 @@ Released: Unreleased * Fixed issue #1919: Submodule visibility with square brackets * Fixed issue #1918: Settings dialog forces to use remotes * Fixed issue #1923: Once Credential node is activated, pressing apply button in Settings dialog will close the dialog + * Fixed issue #1769: "Show Log" missing from context menu if "Shell Extended" and a file was Added but not committed == Known Issues == * If you experience problems with PuTTY ssh, please see issue #1880. diff --git a/src/Git/GitStatus.cpp b/src/Git/GitStatus.cpp index 23f9faff6..66d2ab420 100644 --- a/src/Git/GitStatus.cpp +++ b/src/Git/GitStatus.cpp @@ -174,7 +174,8 @@ void GitStatus::GetStatus(const CTGitPath& path, bool /*update*/ /* = false */, if(path.IsDirectory()) { err = GetDirStatus(sProjectRoot,CString(lpszSubPath),&m_status.text_status , isfull, false,!noignore, NULL, NULL); - + if (m_status.text_status == git_wc_status_added || m_status.text_status == git_wc_status_deleted) // fix for issue #1769; a folder is either modified, conflicted or normal + m_status.text_status = git_wc_status_modified; } else { -- 2.11.4.GIT