From: Myagi <snowcoder@gmail.com>
Date: Tue, 24 Feb 2009 20:48:03 +0000 (+0100)
Subject: icon overlay for "staged" status (uses TSVN's readonly overlay, unused by Git)
X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=6f23b2a728d10fd18350da4d9a8eb24b67f58cf7

icon overlay for "staged" status (uses TSVN's readonly overlay, unused by Git)
---

diff --git a/src/Git/GitStatus.h b/src/Git/GitStatus.h
index a6d61e5..751e980 100644
--- a/src/Git/GitStatus.h
+++ b/src/Git/GitStatus.h
@@ -133,7 +133,7 @@ inline static git_wc_status_kind GitStatusFromWingit(int nStatus)
 	{
 	case WGFS_Normal: return git_wc_status_normal;
 	case WGFS_Modified: return git_wc_status_modified;
-	case WGFS_Staged: return git_wc_status_modified;
+	case WGFS_Staged: return git_wc_status_merged;
 	case WGFS_Added: return git_wc_status_added;
 	case WGFS_Conflicted: return git_wc_status_conflicted;
 	case WGFS_Deleted: return git_wc_status_deleted;
diff --git a/src/TortoiseShell/IconOverlay.cpp b/src/TortoiseShell/IconOverlay.cpp
index bca63c6..c8b5a33 100644
--- a/src/TortoiseShell/IconOverlay.cpp
+++ b/src/TortoiseShell/IconOverlay.cpp
@@ -323,7 +323,6 @@ STDMETHODIMP CShellExt::IsMemberOf(LPCWSTR pwszPath, DWORD /*dwAttrib*/)
 			}
 		case git_wc_status_replaced:
 		case git_wc_status_modified:
-		case git_wc_status_merged:
 			if (m_State == FileStateModified)
 			{
 				g_filepath.clear();
@@ -331,6 +330,14 @@ STDMETHODIMP CShellExt::IsMemberOf(LPCWSTR pwszPath, DWORD /*dwAttrib*/)
 			}
 			else
 				return S_FALSE;
+		case git_wc_status_merged:
+			if (m_State == FileStateReadOnly)
+			{
+				g_filepath.clear();
+				return S_OK;
+			}
+			else
+				return S_FALSE;
 		case git_wc_status_added:
 			if (g_addedovlloaded)
 			{