From 4735a0f910dc5c093e7365948d6153f195aebcf7 Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Wed, 29 Jun 2011 10:44:52 +0200 Subject: [PATCH 1/8] Added an ignore file for sugarcrm. --- SugarCRM.gitignore | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 SugarCRM.gitignore diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore new file mode 100644 index 00000000..2739c772 --- /dev/null +++ b/SugarCRM.gitignore @@ -0,0 +1,24 @@ +## 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/jsLanguage/* +cache/modules/* +!cache/modules/emails +cache/pdf/* +cache/smarty/cache/* +cache/smarty/templates_c/* +cache/xml/* +# Custom configuration should also be ignored. +config.php +config_override.php +# The silent upgrade scripts aren't needed. +silentUpgrade*.php +# Logs files can safely be ignored. +*.log From 8996059f053127e50a1fe0e6901d2bc96612583c Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Wed, 29 Jun 2011 11:17:29 +0200 Subject: [PATCH 2/8] The paths for .htaccess, config.php and config_override.php should be absolute because there may be some files with the same names deeper in the path structure. --- SugarCRM.gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index 2739c772..53cbacd0 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -1,6 +1,6 @@ ## SugarCRM # Ignore custom .htaccess stuff. -.htaccess +/.htaccess # Ignore large parts of the annoying cache directory without breaking things. cache/csv/* cache/dashlets/* @@ -16,8 +16,8 @@ cache/smarty/cache/* cache/smarty/templates_c/* cache/xml/* # Custom configuration should also be ignored. -config.php -config_override.php +/config.php +/config_override.php # The silent upgrade scripts aren't needed. silentUpgrade*.php # Logs files can safely be ignored. From 531059371235239e35b8f18963e59debf21abac8 Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Fri, 1 Jul 2011 10:53:12 +0200 Subject: [PATCH 3/8] Ignore some files and directories from the custom directory. --- SugarCRM.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index 53cbacd0..49ef4bed 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -15,6 +15,10 @@ cache/pdf/* cache/smarty/cache/* cache/smarty/templates_c/* cache/xml/* +# Ignore some files and directories from the custom directory. +custom/history/* +custom/modulebuilder/* +custom/working/* # Custom configuration should also be ignored. /config.php /config_override.php From 8e27618144d89e93e55dc96a120813093815a6f9 Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Fri, 1 Jul 2011 10:57:52 +0200 Subject: [PATCH 4/8] Ignore some javascript which will be regenerated. --- SugarCRM.gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index 49ef4bed..092865ea 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -22,6 +22,15 @@ custom/working/* # Custom configuration should also be ignored. /config.php /config_override.php +# Ignore some javascript which will be regenerated. +include/javascript/sugar_grp1.js +include/javascript/sugar_grp1_yui.js +include/javascript/sugar_grp_yui_widgets.js +include/javascript/sugar_grp_yui_widgets.css +include/javascript/sugar_grp_yui2.js +include/javascript/sugar_grp_overlib.js +include/javascript/sugar_grp_emails.js +include/javascript/sugar_grp_quickcomp.js # The silent upgrade scripts aren't needed. silentUpgrade*.php # Logs files can safely be ignored. From 6047cc668f14ab5777701870389ebee02369dce8 Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Fri, 1 Jul 2011 13:13:02 +0200 Subject: [PATCH 5/8] Revert "Ignore some javascript which will be regenerated." This reverts commit 8e27618144d89e93e55dc96a120813093815a6f9. --- SugarCRM.gitignore | 9 --------- 1 file changed, 9 deletions(-) diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index 092865ea..49ef4bed 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -22,15 +22,6 @@ custom/working/* # Custom configuration should also be ignored. /config.php /config_override.php -# Ignore some javascript which will be regenerated. -include/javascript/sugar_grp1.js -include/javascript/sugar_grp1_yui.js -include/javascript/sugar_grp_yui_widgets.js -include/javascript/sugar_grp_yui_widgets.css -include/javascript/sugar_grp_yui2.js -include/javascript/sugar_grp_overlib.js -include/javascript/sugar_grp_emails.js -include/javascript/sugar_grp_quickcomp.js # The silent upgrade scripts aren't needed. silentUpgrade*.php # Logs files can safely be ignored. From d4467b7bcf75e8209249ebc77d62ee00f1a3856a Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Wed, 6 Jul 2011 14:54:38 +0200 Subject: [PATCH 6/8] The contents of cache/themes can be safely ignored at least from Sugar 6 onward. --- SugarCRM.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index 49ef4bed..378d03fb 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -14,6 +14,7 @@ cache/modules/* cache/pdf/* cache/smarty/cache/* cache/smarty/templates_c/* +cache/themes/* cache/xml/* # Ignore some files and directories from the custom directory. custom/history/* From bf07e7ced897254e791de1d5b4aca4f1d342b22c Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Fri, 8 Jul 2011 09:45:55 +0200 Subject: [PATCH 7/8] The directory cache/include can also be ignored. --- SugarCRM.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index 378d03fb..de1f8851 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -8,6 +8,7 @@ cache/diagnostic/* cache/dynamic_fields/* cache/feeds/* cache/import/* +cache/include/* cache/jsLanguage/* cache/modules/* !cache/modules/emails From 3e939a59d94935880f8ad510b12626b65d77113b Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Thu, 18 Aug 2011 14:09:43 +0200 Subject: [PATCH 8/8] Sometime the emails folder starts with an uppercase letter. --- SugarCRM.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index de1f8851..833485e3 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -12,6 +12,7 @@ cache/include/* cache/jsLanguage/* cache/modules/* !cache/modules/emails +!cache/modules/Emails cache/pdf/* cache/smarty/cache/* cache/smarty/templates_c/*