Skip to content
Snippets Groups Projects
Commit e89feaca authored by Armand Bahi's avatar Armand Bahi
Browse files

Remove squash from subtrees utils

parent 01783af0
Branches
Tags
No related merge requests found
......@@ -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
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment