diff --git a/utils/init_subtrees.sh b/utils/init_subtrees.sh index 7f9c2abf14978552d1ae88ca6b9b119d51c71578..2fd929eb7e01c0aa7d8bfe69a45b2fd436a8ef83 100755 --- a/utils/init_subtrees.sh +++ b/utils/init_subtrees.sh @@ -35,6 +35,15 @@ 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 @@ -42,6 +51,10 @@ 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 diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh index 10a47a286ac6d830391ead930dbc22c43a4a73ce..974f28eb45b045fcdfd8ce22b2fd07ae331334de 100755 --- a/utils/pull_subtrees.sh +++ b/utils/pull_subtrees.sh @@ -18,14 +18,6 @@ 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 @@ -35,11 +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