From df51dcbc3778c2266fea307580b6eba786d5a369 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 30 Nov 2018 12:10:37 +0100
Subject: [PATCH] Remove squash from pullsubtrees
---
utils/pull_subtrees.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh
index b61243f9..c91905cf 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 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
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 ${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
done
fi
--
GitLab