Removes post-update hook

diff --git a/Makefile b/Makefile
index 97c4a58c998b71fce59887516a6f350e3405526e..d13a8786f265938f97f7a6119c7e2fc2bbb19f88 100644 (file)
--- 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 996189df186c799b213d47979a6945ddcc6dbd9f..48a6a16cb27970795e8d4455ac8f614344ac32e0 100755 (executable)
--- 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