OSDN Git Service

Show Auto following tag at log dialog box
authorFrank Li <lznuaa@gmail.com>
Mon, 5 Jan 2009 15:38:32 +0000 (23:38 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 5 Jan 2009 15:38:32 +0000 (23:38 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Git/Git.cpp
src/TortoiseProc/GitLogList.cpp

index 131fc91..87c5d89 100644 (file)
@@ -408,7 +408,7 @@ int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)
 {\r
        int ret;\r
        CString cmd,output;\r
-       cmd=_T("git show-ref");\r
+       cmd=_T("git show-ref -d");\r
        ret=g_Git.Run(cmd,&output);\r
        if(!ret)\r
        {\r
index bd087b0..03e1d71 100644 (file)
@@ -267,9 +267,12 @@ void CGitLogList::ResizeAllListCtrlCols()
 \r
 BOOL CGitLogList::GetShortName(CString ref, CString &shortname,CString prefix)\r
 {\r
+       TRACE(_T("%s %s\r\n"),ref,prefix);\r
        if(ref.Left(prefix.GetLength()) ==  prefix)\r
        {\r
                shortname = ref.Right(ref.GetLength()-prefix.GetLength());\r
+               if(shortname.Right(3)==_T("^{}"))\r
+                       shortname=shortname.Left(shortname.GetLength()-3);\r
                return TRUE;\r
        }\r
        return FALSE;\r