diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2021-08-05 19:35:16 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2021-08-05 19:35:16 +0200 |
| commit | ab20e244401dd6f8a23a84071725845c7f26be11 (patch) | |
| tree | 217212a5e508d2cbead77898087794c7c671fe73 /lib/gitolite3 | |
| parent | 9508272d616b8bf341f208a3857cd033794e9f14 (diff) | |
silence pull reconciling warning in gitolite hook
Diffstat (limited to 'lib/gitolite3')
| -rwxr-xr-x | lib/gitolite3/hooks/common/post-receive | 1 |
1 files changed, 1 insertions, 0 deletions
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 - ) |