X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FGit%2FGitHash.h;h=4d65ba718fce2b9c189048e9750fed17da5e21cb;hp=900aa166bd485087cfdcd0c80cbdc3538d798513;hb=HEAD;hpb=da3b0ecf89e52abb0142df05f1fd72b98889b78d

diff --git a/src/Git/GitHash.h b/src/Git/GitHash.h
index 900aa16..4d65ba7 100644
--- a/src/Git/GitHash.h
+++ b/src/Git/GitHash.h
@@ -6,8 +6,9 @@
 
 class CGitHash
 {
-	unsigned char m_hash[GIT_HASH_SIZE];
 public:
+	unsigned char m_hash[GIT_HASH_SIZE];
+
 	CGitHash()
 	{
 		memset(m_hash,0, GIT_HASH_SIZE);
@@ -28,17 +29,18 @@ public:
 		{
 			unsigned char a;
 			a=0;
-			for(int j=2*i;j<2*i+1;j++)
+			for(int j=2*i;j<=2*i+1;j++)
 			{
+				a =a<<4;
+
 				TCHAR ch = str[j];
 				if(ch >= _T('0') && ch <= _T('9'))
 					a |= (ch - _T('0'))&0xF;
 				else if(ch >=_T('A') && ch <= _T('F'))
-					a |= (ch - _T('A'))&0xF;
+					a |= ((ch - _T('A'))&0xF) + 10 ;
 				else if(ch >=_T('a') && ch <= _T('f'))
-					a |= (ch - _T('a'))&0xF;
+					a |= ((ch - _T('a'))&0xF) + 10;		
 				
-				a =a<<4;
 			}
 			m_hash[i]=a;
 		}
@@ -63,7 +65,7 @@ public:
 		CString a;
 		for(int i=0;i<GIT_HASH_SIZE;i++)
 		{
-			a.Format(_T("%02X"),m_hash[i]);
+			a.Format(_T("%02x"),m_hash[i]);
 			str+=a;
 		}
 		return str;
@@ -89,6 +91,10 @@ public:
 		return memcmp(left.m_hash, right.m_hash, GIT_HASH_SIZE) > 0;
 	}
 
+	friend bool operator != (const CGitHash& left, const CGitHash& right)
+	{
+		return memcmp(left.m_hash, right.m_hash, GIT_HASH_SIZE) != 0;
+	}
 #if defined(_MFC_VER)
 	friend CArchive& AFXAPI operator<<(CArchive& ar, CGitHash& hash)
 	{