From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 23 Nov 2015 18:16:44 +0000 (-0200)
Subject: Removes post-update hook
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=701ed3bfec821058ee1159f3b4a09a32941e9393;p=puppet-bootstrap.git

Removes post-update hook
---

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