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

Remove squash from pullsubtrees

parent fc239ab6
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
utils/pull_subtrees.sh
+ 2
− 2
View file @ df51dcbc
...@@ -17,7 +17,7 @@ cd .. ...@@ -17,7 +17,7 @@ cd ..
# Vitis # Vitis
echo "---- Pull vitis ----" echo "---- Pull vitis ----"
git subtree pull --prefix src/vitis --squash -m "pull vitis $vitisVersion" "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" $vitisVersion git subtree pull --prefix src/vitis -m "pull vitis $vitisVersion" "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" $vitisVersion
# Modules # Modules
if [[ $depsCount > 0 ]]; then if [[ $depsCount > 0 ]]; then
...@@ -26,7 +26,7 @@ if [[ $depsCount > 0 ]]; then ...@@ -26,7 +26,7 @@ if [[ $depsCount > 0 ]]; then
echo "---- Pull ${aDeps[$i, name]} ----" echo "---- Pull ${aDeps[$i, name]} ----"
# Ajoute le dépôt # Ajoute le dépôt
git subtree pull --prefix src/${aDeps[$i, name]} --squash -m "pull ${aDeps[$i, name]} ${aDeps[$i, version]}" "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" ${aDeps[$i, version]} git subtree pull --prefix src/${aDeps[$i, name]} -m "pull ${aDeps[$i, name]} ${aDeps[$i, version]}" "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" ${aDeps[$i, version]}
fi fi
done done
fi fi
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment