From 65d69a474bc45d0fb4c280a0bdfe6a97e53f1e6e Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 31 Oct 2018 12:14:06 +0100
Subject: [PATCH] Remove auto pull/push subtrees
---
utils/githooks/post-merge | 15 ++++++++-------
utils/githooks/pre-push | 11 ++++++-----
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/utils/githooks/post-merge b/utils/githooks/post-merge
index 548e6ae5..45b38b21 100755
--- a/utils/githooks/post-merge
+++ b/utils/githooks/post-merge
@@ -9,10 +9,11 @@
#
echo "****** Post-merge Hook ******"
-echo "****** Pull subtrees ******"
-echo "$(pwd)"
-
-if [ -d "$(pwd)/utils" ]; then
- cd utils
- ./pull_subtrees.sh
-fi
+echo "****** Pull ******"
+# echo "****** Pull subtrees ******"
+# echo "$(pwd)"
+#
+# if [ -d "$(pwd)/utils" ]; then
+# cd utils
+# ./pull_subtrees.sh
+# fi
diff --git a/utils/githooks/pre-push b/utils/githooks/pre-push
index 50401f9e..c5e4e953 100755
--- a/utils/githooks/pre-push
+++ b/utils/githooks/pre-push
@@ -13,9 +13,10 @@ url="$2"
if [ $remote != $url ]; then
echo "****** Pre-push Hook ******"
- echo "****** Push subtrees ******"
- if [ -d "$(pwd)/utils" ]; then
- cd utils
- ./push_subtrees.sh
- fi
+ echo "****** Push ******"
+ # echo "****** Push subtrees ******"
+ # if [ -d "$(pwd)/utils" ]; then
+ # cd utils
+ # ./push_subtrees.sh
+ # fi
fi
--
GitLab