From ff6fa231f96283ad30c63a1278966b7e6725d5fa Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Tue, 12 Nov 2013 09:37:03 +0100 Subject: [PATCH] Added the new upload directories and ignore the cache directory completely. With SugarCRM 6.4 the `cache/upload` directory moved to `upload` and `upload_backup`. These directories can safely be ignored. Additionally the `cache` directory is now ignored completely because it leads to the behaviour to use the git repository as a kind of backup tool if several parts of it are included. Furthermore the directory structure beneath `cache` is victim of enduring changes by the developers. I did also some code cleanup regarding the path names e.g. adding a `/` before most file and directory names. --- SugarCRM.gitignore | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index c2d893a9..28668ff1 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -1,33 +1,21 @@ ## SugarCRM # Ignore custom .htaccess stuff. /.htaccess -# Ignore large parts of the annoying cache directory without breaking things. -cache/csv/* -cache/dashlets/* -cache/diagnostic/* -cache/dynamic_fields/* -cache/feeds/* -cache/import/* -cache/include/* -cache/jsLanguage/* -cache/modules/* -!cache/modules/emails -!cache/modules/Emails -cache/pdf/* -cache/smarty/cache/* -cache/smarty/templates_c/* -cache/themes/* -cache/xml/* +# Ignore the cache directory completely. ATTENTION! This will break things! +/cache/* # Ignore some files and directories from the custom directory. -custom/history/* -custom/modulebuilder/* -custom/working/* -custom/modules/*/Ext/ -custom/application/Ext/* +/custom/history/* +/custom/modulebuilder/* +/custom/working/* +/custom/modules/*/Ext/ +/custom/application/Ext/* # Custom configuration should also be ignored. /config.php /config_override.php # The silent upgrade scripts aren't needed. -silentUpgrade*.php +/silentUpgrade*.php # Logs files can safely be ignored. *.log +# Ignore the new upload directories. +/upload/* +/upload_backup/* -- 2.39.5