Ignore properties files

utils/init_subtrees.sh

@@ -35,15 +35,6 @@ if [[ $depsCount > 0 ]]; then
 	echo "---- Init conf ----"
 	git subtree add --squash -m "add subtree" --prefix src/closure "git@gitlab.veremes.net:Development/vitis_apps/sources/closure.git" master
 
-	# fichiers à ignorer
-	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
 	for (( i=1; i <= $depsCount; i++ )); do
 		if [ ${aDeps[$i, nature]} == "modules" ]; then
@@ -51,10 +42,6 @@ if [[ $depsCount > 0 ]]; then
 
 		    # Ajoute le dépôt
 			git subtree add --squash -m "add subtree" --prefix src/${aDeps[$i, name]} "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" ${aDeps[$i, version]}
-			# 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
 

utils/pull_subtrees.sh

@@ -19,6 +19,15 @@ 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 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
@@ -27,6 +36,10 @@ 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