From d1ea865031d7fdabc3fb2cd405b9403a4cfe7b05 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sun, 31 Jan 2016 22:09:24 -0200 Subject: Post-receive: receive.denyCurrentBranch --- ikiwiki/Makefile | 1 - ikiwiki/bin/post-receive | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki/Makefile b/ikiwiki/Makefile index 97b5ce8..e3d6344 100644 --- 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 9c79a40..47d4f79 100755 --- 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 -- cgit v1.2.3