Post-receive: receive.denyCurrentBranch

diff --git a/ikiwiki/Makefile b/ikiwiki/Makefile
index 97b5ce8cf7a361999a135ddc79758ce85f31ea2a..e3d63449bd00205a2dc6176bbd0463afd4d91eee 100644 (file)
--- a/ikiwiki/Makefile
+++ b/ikiwiki/Makefile
@@ -28,7 +28,6 @@ web_deploy:
 publish: web web_deploy
 
 post_receive:
-       git config receive.denyCurrentBranch ignore
        cd .git/hooks && ln -sf ../../bin/post-receive
 
 whoami:

diff --git a/ikiwiki/bin/post-receive b/ikiwiki/bin/post-receive
index 9c79a407489a18164bb36ce475087de259d38598..47d4f79a9e17d7ebd12d57c972615d0fbcd0b9c7 100755 (executable)
--- a/ikiwiki/bin/post-receive
+++ b/ikiwiki/bin/post-receive
@@ -9,6 +9,7 @@ unset GIT_DIR
 if [ -d ".git/annex" ]; then
   git annex sync
 else
+  git config receive.denyCurrentBranch ignore
   git reset HEAD
   git checkout -f
 fi