From 06cc1a2d42da55f49f3e0a259aeddb930475d528 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Tue, 16 Oct 2018 19:56:32 +0200
Subject: [PATCH] ignore properties files
---
.gitignore | 8 ++++----
utils/pull_subtrees.sh | 13 +++++++++++++
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index ab778a58..fb51b4fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,10 +7,10 @@ src/vitis/vas/public/
src/vitis/vas/server/
src/vitis/vas/ws_data/
src/vitis/vas/tmp/
-src/vitis/vas/rest/.htaccess
-src/vitis/client/conf
-**/conf/properties*
-**/conf/version.inc
+# src/vitis/vas/rest/.htaccess
+# src/vitis/client/conf
+# **/conf/properties*
+# **/conf/version.inc
src/vitis/client/modules/
! src/vitis/client/modules/vitis/
src/vitis/vas/rest/ws/*
diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh
index 974f28eb..10a47a28 100755
--- a/utils/pull_subtrees.sh
+++ b/utils/pull_subtrees.sh
@@ -18,6 +18,14 @@ cd ..
# Vitis
echo "---- Pull vitis ----"
git subtree pull --prefix src/vitis --squash -m "pull subtree" "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" master
+# Fichiers à ignorer les modifications
+git update-index --assume-unchanged conf/properties.json
+git update-index --assume-unchanged src/vitis/vas/rest/.htaccess
+git update-index --assume-unchanged src/vitis/vas/rest/conf/properties.inc
+git update-index --assume-unchanged src/vitis/vas/rest/conf/properties_domain.inc
+git update-index --assume-unchanged src/vitis/vas/rest/conf/properties_post.inc
+git update-index --assume-unchanged src/vitis/vas/rest/conf/properties_server.inc
+git update-index --assume-unchanged src/vitis/vas/rest/conf/version.inc
# Modules
if [[ $depsCount > 0 ]]; then
@@ -27,6 +35,11 @@ if [[ $depsCount > 0 ]]; then
# Ajoute le dépôt
git subtree pull --prefix src/${aDeps[$i, name]} --squash -m "pull subtree" "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" master
+
+ # fichiers à ignorer
+ git update-index --assume-unchanged src/${aDeps[$i, name]}/web_service/conf/properties.inc
+ git update-index --assume-unchanged src/${aDeps[$i, name]}/web_service/conf/properties_server.inc
+ git update-index --assume-unchanged src/${aDeps[$i, name]}/web_service/conf/version.inc
fi
done
fi
--
GitLab