From df3fda74e09f1c80677b6e20be4ba4c7baf7edde Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 12 Oct 2018 15:36:23 +0200
Subject: [PATCH] Automatically pull the subtrees
---
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 405d7095..974f28eb 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 from module" "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" master
+git subtree pull --prefix src/vitis --squash -m "pull subtree" "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" master
# 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 from module" "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" master
+ 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
fi
done
fi
--
GitLab