aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-11-09 18:08:54 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-11-09 18:08:54 -0200
commit80c14f00ccffcd1963584d7329494839348f80c4 (patch)
tree8222fd257d5a13a2f42366b3e99334fd4b6eb90c
parent2beaa3c3f984028a2245851c848f40e8fe24b1b3 (diff)
downloadtemplates-80c14f00ccffcd1963584d7329494839348f80c4.tar.gz
templates-80c14f00ccffcd1963584d7329494839348f80c4.tar.bz2
Remove post-update hook
-rwxr-xr-xikiwiki/bin/post-receive14
-rwxr-xr-xikiwiki/bin/post-update16
2 files changed, 13 insertions, 17 deletions
diff --git a/ikiwiki/bin/post-receive b/ikiwiki/bin/post-receive
index 996189d..9c79a40 100755
--- 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
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