Add remote branch name at pull\fetch dialog.

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

diff --git a/src/Git/TGitPath.cpp b/src/Git/TGitPath.cpp
index 319e17e..b0aec5c 100644 (file)
--- a/src/Git/TGitPath.cpp
+++ b/src/Git/TGitPath.cpp
@@ -838,12 +838,12 @@ int CTGitPathList::FillUnRev(int action,CTGitPathList *list)
                \r
                if(list==NULL)\r
                {\r
-                       cmd=_T("git.cmd ls-files --exclude-standard --full-name --others");\r
+                       cmd=_T("git.exe ls-files --exclude-standard --full-name --others");\r
                        cmd+=ignored;\r
                        \r
                }\r
                else\r
-               {       cmd.Format(_T("git.cmd ls-files --exclude-standard --full-name --others %s-- \"%s\""),\r
+               {       cmd.Format(_T("git.exe ls-files --exclude-standard --full-name --others %s-- \"%s\""),\r
                                        ignored,\r
                                        (*list)[i].GetWinPathString());\r
                }\r
@@ -855,11 +855,13 @@ int CTGitPathList::FillUnRev(int action,CTGitPathList *list)
                while( pos>=0 )\r
                {\r
                        one=out.Tokenize(_T("\n"),pos);\r
-\r
-                       //SetFromGit will clear all status\r
-                       path.SetFromGit(one);\r
-                       path.m_Action=action;\r
-                       AddPath(path);\r
+                       if(!one.IsEmpty())\r
+                       {\r
+                               //SetFromGit will clear all status\r
+                               path.SetFromGit(one);\r
+                               path.m_Action=action;\r
+                               AddPath(path);\r
+                       }\r
                }\r
        }\r
        return 0;\r