From ff6fa231f96283ad30c63a1278966b7e6725d5fa Mon Sep 17 00:00:00 2001
From: Jens Jahnke <jan0sch@gmx.net>
Date: Tue, 12 Nov 2013 09:37:03 +0100
Subject: [PATCH 1/3] 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/*

From b34ccb38532215b0d9f86955eff1f2f00f0e8d86 Mon Sep 17 00:00:00 2001
From: Jens Jahnke <jan0sch@gmx.net>
Date: Tue, 12 Nov 2013 12:20:11 +0100
Subject: [PATCH 2/3] Adapted the ignored directories to use `dir/` instead of
 `dir/*`

---
 SugarCRM.gitignore | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore
index 28668ff1..07ee1ce5 100644
--- a/SugarCRM.gitignore
+++ b/SugarCRM.gitignore
@@ -2,13 +2,13 @@
 # Ignore custom .htaccess stuff.
 /.htaccess
 # Ignore the cache directory completely. ATTENTION! This will break things!
-/cache/*
+/cache/
 # Ignore some files and directories from the custom directory.
-/custom/history/*
-/custom/modulebuilder/*
-/custom/working/*
+/custom/history/
+/custom/modulebuilder/
+/custom/working/
 /custom/modules/*/Ext/
-/custom/application/Ext/*
+/custom/application/Ext/
 # Custom configuration should also be ignored.
 /config.php
 /config_override.php
@@ -17,5 +17,5 @@
 # Logs files can safely be ignored.
 *.log
 # Ignore the new upload directories.
-/upload/*
-/upload_backup/*
+/upload/
+/upload_backup/

From 1c580917237baddaf69ec47cd231c04a0808e4ce Mon Sep 17 00:00:00 2001
From: Jens Jahnke <jan0sch@gmx.net>
Date: Wed, 27 Nov 2013 17:30:57 +0100
Subject: [PATCH 3/3] Explanations for ignoring the cache directory

I wrote a more explanatory comment regarding the cache directory
and why it is ignored.
---
 SugarCRM.gitignore | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore
index 07ee1ce5..842c3ec5 100644
--- a/SugarCRM.gitignore
+++ b/SugarCRM.gitignore
@@ -1,7 +1,11 @@
 ## SugarCRM
 # Ignore custom .htaccess stuff.
 /.htaccess
-# Ignore the cache directory completely. ATTENTION! This will break things!
+# Ignore the cache directory completely.
+# This will break the current behaviour. Which was often leading to
+# the misuse of the repository as backup replacement.
+# For development the cache directory can be safely ignored and
+# therefore it is ignored.
 /cache/
 # Ignore some files and directories from the custom directory.
 /custom/history/