From 577d765475a3a7f1b500cd8d48821de8723061e4 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Thu, 18 Oct 2018 12:43:37 +0200
Subject: [PATCH] Modify symlinks strategy
---
utils/pull_subtrees.sh | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh
index c2793f2e..974f28eb 100755
--- a/utils/pull_subtrees.sh
+++ b/utils/pull_subtrees.sh
@@ -19,16 +19,6 @@ cd ..
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
-git update-index --assume-unchanged conf/properties.json
-git update-index --assume-unchanged conf/package.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
for (( i=1; i <= $depsCount; i++ )); do
@@ -37,10 +27,6 @@ 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