'Cherry-pick' commits after combined commits when combine is done

[tortoisegit/TortoiseGitJp.git] / src / Git / Git.cpp

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index bb32abf..922b181 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -599,7 +599,8 @@ git_revnum_t CGit::GetHash(CString &friendname)
        CString out;\r
        cmd.Format(_T("git.exe rev-parse %s" ),friendname);\r
        Run(cmd,&out,CP_UTF8);\r
-       int pos=out.ReverseFind(_T('\n'));\r
+//     int pos=out.ReverseFind(_T('\n'));\r
+       int pos=out.FindOneOf(_T("\r\n"));\r
        if(pos>0)\r
                return out.Left(pos);\r
        return out;\r