浏览代码

Merge pull request #2154 from richardkchapman/gitinclude

FEATURE - hook-based git file reading

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 13 年之前
父节点
当前提交
655a259fe6
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 2 1
      common/remote/gitfile.cpp
  2. 1 1
      system/jlib/jfile.hpp

+ 2 - 1
common/remote/gitfile.cpp

@@ -164,6 +164,7 @@ public:
             modifiedTime->clear();
         if (accessedTime)
             accessedTime->clear();
+        return false;
     }
     virtual fileBool isDirectory()
     {
@@ -296,7 +297,7 @@ public:
     virtual bool isDir()
     {
         assertex(curFile);
-        return curFile->isDirectory();
+        return curFile->isDirectory()==foundYes;
     }
     virtual __int64 getFileSize()
     {

+ 1 - 1
system/jlib/jfile.hpp

@@ -506,7 +506,7 @@ inline StringBuffer &removeTrailingPathSepChar(StringBuffer &path)
     if (path.length()>1 && isPathSepChar(path.charAt(path.length()-1)))
     {
 #ifdef _WIN32
-    // In addition to not removing \ if it's the only char in the path, you should not remove it the path
+    // In addition to not removing / if it's the only char in the path, you should not remove it the path
     // is of the form c:\
         if (path.length()>3 || path.charAt(1) != ':')
 #endif