From ab20e244401dd6f8a23a84071725845c7f26be11 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 5 Aug 2021 19:35:16 +0200 Subject: silence pull reconciling warning in gitolite hook --- lib/gitolite3/hooks/common/post-receive | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/gitolite3') diff --git a/lib/gitolite3/hooks/common/post-receive b/lib/gitolite3/hooks/common/post-receive index 6546a38..49803c2 100755 --- a/lib/gitolite3/hooks/common/post-receive +++ b/lib/gitolite3/hooks/common/post-receive @@ -27,6 +27,7 @@ if [ -e "$GIT_WORK_TREE" ]; then else echo "Checking out content to $GIT_WORK_TREE ..." git -C "$WEB_BASEDIR" clone --quiet --branch "$WEB_BRANCH" "$PWD" + git -C "$GIT_WORK_TREE" config pull.ff only chmod -R u=rw,go=r,a+X "$GIT_WORK_TREE" if [ -n "$WEB_EXEC_INIT" ]; then ( cd "$GIT_WORK_TREE" && echo "$WEB_EXEC_INIT" | sh - ) -- cgit v1.2.3