Remove post-update hook

diff --git a/ikiwiki/bin/post-receive b/ikiwiki/bin/post-receive
index 996189df186c799b213d47979a6945ddcc6dbd9f..9c79a407489a18164bb36ce475087de259d38598 100755 (executable)
--- a/ikiwiki/bin/post-receive
+++ b/ikiwiki/bin/post-receive
@@ -1,7 +1,19 @@
 #!/bin/sh
+#
+# Post-receive git hook
+#
 
 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

diff --git a/ikiwiki/bin/post-update b/ikiwiki/bin/post-update
deleted file mode 100755 (executable)
index 48a6a16..0000000
--- a/ikiwiki/bin/post-update
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-cd ..
-unset GIT_DIR
-
-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