Skip git directory

5 years ago · 255c6956c7
parent 1f6b79202c
commit 255c6956c7
2 changed files with 5 additions and 3 deletions
--- a/code/nel/src/misc/path.cpp
+++ b/code/nel/src/misc/path.cpp
@ -898,9 +898,9 @@ void CFileContainer::getPathContent (const string &path, bool recurse, bool want
 		if (isdirectory(de))
 		{
 			// skip CVS, .svn and .hg directory
-			if ((!showEverything) && (fn == "CVS" || fn == ".svn" || fn == ".hg"))
+			if ((!showEverything) && (fn == "CVS" || fn == ".svn" || fn == ".hg" || fn == ".git"))
 			{
-				NL_DISPLAY_PATH("PATH: CPath::getPathContent(%s, %d, %d, %d): skip CVS, .svn and .hg directory", path.c_str(), recurse, wantDir, wantFile);
+				NL_DISPLAY_PATH("PATH: CPath::getPathContent(%s, %d, %d, %d): skip '%s' directory", path.c_str(), recurse, wantDir, wantFile, fn.c_str());
 				continue;
 			}

--- a/code/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
+++ b/code/ryzom/tools/leveldesign/georges_dll/file_tree_view.cpp
@ -457,7 +457,9 @@ bool CFileTreeCtrl::enumObjects(HTREEITEM hParentItem,IShellFolder* pParentFolde
 			string ext5 = pItemInfo->displayName.substr(displayNameSize-5);

 			bool cvs = ext3 == "CVS" || ext4 == "CVS\\" || ext4 == "CVS/" ||
-				ext4 == ".svn" || ext5 == ".svn\\" || ext5 == ".svn/";
+				ext4 == ".svn" || ext5 == ".svn\\" || ext5 == ".svn/" ||
+				ext4 == ".hg" || ext5 == ".hg\\" || ext5 == ".hg/" ||
+				ext4 == ".git" || ext5 == ".git\\" || ext5 == ".git/";

 /*			bool cvs = ( pItemInfo->displayName[displayNameSize-3] == 'C') &&
 				(pItemInfo->displayName[displayNameSize-2] == 'V') &&