aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorCache do Fluxo <cache@fluxo.info>2016-01-31 22:06:40 -0200
committerCache do Fluxo <cache@fluxo.info>2016-01-31 22:06:40 -0200
commit82103c29ca0f94f6df43e6b81fd57fa170aa985f (patch)
tree4057c56a295f48a489c940a0df59fb7af86e089f /bin
parent7ed289a70e0167ec9265859a02ace0896a7d70cb (diff)
downloadcache-82103c29ca0f94f6df43e6b81fd57fa170aa985f.tar.gz
cache-82103c29ca0f94f6df43e6b81fd57fa170aa985f.tar.bz2
Support post-receive hook only
Diffstat (limited to 'bin')
-rwxr-xr-xbin/post-receive15
-rwxr-xr-xbin/post-update16
2 files changed, 14 insertions, 17 deletions
diff --git a/bin/post-receive b/bin/post-receive
index 996189d..be32fee 100755
--- a/bin/post-receive
+++ b/bin/post-receive
@@ -1,7 +1,20 @@
#!/bin/sh
+#
+# Post-receive git hook
+#
cd ..
unset GIT_DIR
-git checkout -f
+if [ -d ".git/annex" ]; then
+ git annex sync
+else
+ git config receive.denyCurrentBranch ignore
+ git reset HEAD
+ git checkout -f
+fi
+
git submodule update --init --recursive
+
+cd -
+exec git update-server-info
diff --git a/bin/post-update b/bin/post-update
deleted file mode 100755
index 48a6a16..0000000
--- a/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