aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-11-23 16:16:44 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-11-23 16:16:44 -0200
commit701ed3bfec821058ee1159f3b4a09a32941e9393 (patch)
tree643527a25c1e02991b3664a71735ac41c22bcca2
parent4a684e7a7f43c23715a3e3710144c3df25269d3f (diff)
downloadpuppet-bootstrap-701ed3bfec821058ee1159f3b4a09a32941e9393.tar.gz
puppet-bootstrap-701ed3bfec821058ee1159f3b4a09a32941e9393.tar.bz2
Removes post-update hook
-rw-r--r--Makefile4
-rwxr-xr-xbin/post-receive11
2 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 97c4a58..d13a878 100644
--- a/Makefile
+++ b/Makefile
@@ -58,10 +58,6 @@ clean:
rm -rf modules
git checkout modules
-post_update:
- git config receive.denyCurrentBranch ignore
- cd .git/hooks && ln -sf ../../bin/post-update
-
post_receive:
git config receive.denyCurrentBranch ignore
cd .git/hooks && ln -sf ../../bin/post-receive
diff --git a/bin/post-receive b/bin/post-receive
index 996189d..48a6a16 100755
--- a/bin/post-receive
+++ b/bin/post-receive
@@ -3,5 +3,14 @@
cd ..
unset GIT_DIR
-git checkout -f
+if [ -d ".git/annex" ]; then
+ git annex sync
+else
+ git reset HEAD
+ git checkout -f
+fi
+
git submodule update --init --recursive
+
+cd -
+exec git update-server-info