From 6936f3067d4bcee08774a320434f247af4a64ce9 Mon Sep 17 00:00:00 2001
From: malikkotob <malikkotob@users.noreply.github.com>
Date: Fri, 24 Mar 2017 19:28:40 -0400
Subject: [PATCH] Prevent gitignore from being overwritten on blt upgrades.
 (#1256)

---
 .gitignore                      | 4 ++++
 blt-project/.gitignore          | 2 --
 scripts/blt/ignore-existing.txt | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 blt-project/.gitignore

diff --git a/.gitignore b/.gitignore
index 3f5db6d10..473cb7734 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+# Ignore blt-project files
+blt-project/composer.lock
+blt-project/vendor
+
 # Ignore config files
 /project.yml
 local.*
diff --git a/blt-project/.gitignore b/blt-project/.gitignore
deleted file mode 100644
index 987e2a253..000000000
--- a/blt-project/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-composer.lock
-vendor
diff --git a/scripts/blt/ignore-existing.txt b/scripts/blt/ignore-existing.txt
index 98f931d5c..f9621ffa0 100644
--- a/scripts/blt/ignore-existing.txt
+++ b/scripts/blt/ignore-existing.txt
@@ -1,6 +1,7 @@
 # These files from template dir will be included if they do not yet exist. They will not overwrite
 # existing files.
 .gitattributes
+.gitignore
 blt/composer.overrides.json
 blt/example.project.local.yml
 blt/project.yml