diff --git a/utils/init_subtrees.sh b/utils/init_subtrees.sh index 7f9c2abf14978552d1ae88ca6b9b119d51c71578..9f47310273b19096c1984d681688d7c6e676c8f2 100755 --- a/utils/init_subtrees.sh +++ b/utils/init_subtrees.sh @@ -30,10 +30,10 @@ if [[ $depsCount > 0 ]]; then # Vitis echo "---- Init vitis ----" - git subtree add --squash -m "add subtree" --prefix src/vitis "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" $vitisVersion + git subtree add --prefix src/vitis "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" $vitisVersion echo "---- Init conf ----" - git subtree add --squash -m "add subtree" --prefix src/closure "git@gitlab.veremes.net:Development/vitis_apps/sources/closure.git" master + git subtree add --prefix src/closure "git@gitlab.veremes.net:Development/vitis_apps/sources/closure.git" master # Modules for (( i=1; i <= $depsCount; i++ )); do @@ -41,7 +41,7 @@ if [[ $depsCount > 0 ]]; then echo "---- Init ${aDeps[$i, name]} : ${aDeps[$i, version]}----" # 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]} + git subtree add --prefix src/${aDeps[$i, name]} "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" ${aDeps[$i, version]} fi done diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh index 5cac1ba0c4a626761809103e822793ec694068a4..e2fb1abc223714463f4a9408dfedcee27cbb4d9e 100755 --- a/utils/pull_subtrees.sh +++ b/utils/pull_subtrees.sh @@ -17,7 +17,7 @@ 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" $vitisVersion +git subtree pull --prefix src/vitis "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" $vitisVersion # Modules if [[ $depsCount > 0 ]]; then @@ -26,7 +26,7 @@ if [[ $depsCount > 0 ]]; then echo "---- Pull ${aDeps[$i, name]} ----" # 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" ${aDeps[$i, version]} + git subtree pull --prefix src/${aDeps[$i, name]} "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" ${aDeps[$i, version]} fi done fi