From 9fe746326d5adda55558e8b099b508a187ca02f9 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Wed, 19 May 2021 11:11:18 -0400
Subject: [PATCH] Update gitignore for mepo update

Soon, `mepo` will have the ability to checkout subrepos as `repo`, `repo@`, or `@repo`. This commit updates the `.gitignore` files to support this flexibility.
---
 .gitignore                  | 5 ++++-
 src/Applications/.gitignore | 6 ++++++
 src/Components/.gitignore   | 8 ++++++++
 src/Shared/.gitignore       | 9 ++++++++-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index bbb5eb68..78f284ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
 *~
 /@cmake/
-/@modules/
+/cmake/
+/cmake@/
 /@env/
+/env/
+/env@/
 /.mepo/
 parallel_build.o*
 log.*
diff --git a/src/Applications/.gitignore b/src/Applications/.gitignore
index 5b45d5dd..11bfbc55 100644
--- a/src/Applications/.gitignore
+++ b/src/Applications/.gitignore
@@ -1,4 +1,10 @@
 /@GEOSgcm_App
+/GEOSgcm_App
+/GEOSgcm_App@
 /@CPLFCST_Etc
+/CPLFCST_Etc
+/CPLFCST_Etc@
 /@UMD_Etc
+/UMD_Etc
+/UMD_Etc@
 
diff --git a/src/Components/.gitignore b/src/Components/.gitignore
index 375e7a09..b01d942c 100644
--- a/src/Components/.gitignore
+++ b/src/Components/.gitignore
@@ -1,4 +1,12 @@
 /@GEOSagcmPert_GridComp
+/GEOSagcmPert_GridComp
+/GEOSagcmPert_GridComp@
 /@GEOSana_GridComp
+/GEOSana_GridComp
+/GEOSana_GridComp@
 /@GEOSgcm_GridComp
+/GEOSgcm_GridComp
+/GEOSgcm_GridComp@
 /@g5pert
+/g5pert
+/g5pert@
diff --git a/src/Shared/.gitignore b/src/Shared/.gitignore
index 6ea8ac2e..7bc3f09f 100644
--- a/src/Shared/.gitignore
+++ b/src/Shared/.gitignore
@@ -1,5 +1,12 @@
 /@GMAO_Shared
+/GMAO_Shared
+/GMAO_Shared@
 /@MAPL
+/MAPL
+/MAPL@
 /@NCEP_Shared
+/NCEP_Shared
+/NCEP_Shared@
 /@FMS
-/@GSW
+/FMS
+/FMS@