我正在尝试设置Git来暂存我的网站,以便我可以git pull
让当前版本在本地工作,然后git push
将更改推送到远程服务器。我已经设置它以便按照我想要的方式工作,但是在我推送之后,我必须在远程服务器上手动运行git checkout -f
或git reset --hard HEAD
。
我已经尝试将这些作为服务器上的post-receive挂钩添加到shell脚本中,但它似乎没有任何效果。我知道脚本正在运行,因为我在推送后看到“更改推送到服务器”。这是post-receive hook:
#!/bin/sh
git reset --hard HEAD
echo "Changes pushed to server."
答案 0 :(得分:73)
您的问题的答案如下:http://toroid.org/ams/git-website-howto
简而言之,您要做的是将“分离的工作树”添加到裸存储库中。通常,您认为您的工作树包含.git
目录。根据定义,裸存储库没有工作树,但只要它位于与裸存储库不同的目录中,您就可以创建工作树。
post-receive挂钩只是一个简单的git checkout -f
,可以将存储库的HEAD
复制到工作目录中。 Apache使用它作为它的文档根目录,你们都已经设置好了。无论何时推送到裸存储库,Apache都会立即开始提供服务。
我通常使用它来自动推送到临时服务器,以查看“真实”环境是否会对我的更改产生影响。部署到实时服务器是一个完全不同的故事。 : - )
答案 1 :(得分:15)
2015年3月更新
正如我在“What is this Git warning message when pushing changes to a remote repository?”中所提到的,您实际上可以将直接推送到非裸机库(Git 2.3.0 +,2015年2月),其中包含:
git config receive.denyCurrentBranch updateInstead
相应地更新工作树,但如果有任何未提交的更改,则拒绝这样做。
这样可以避免任何后接收挂钩。
(原答案:2010年10月)
GitFAQ建议non-bare repo此更新后的挂钩:
(它可能会给你更多关于钩子执行中实际发生情况的线索。注意这是一个更新后的钩子,而不是后期接收)
#!/bin/sh
#
# This hook does two things:
#
# 1. update the "info" files that allow the list of references to be
# queries over dumb transports such as http
#
# 2. if this repository looks like it is a non-bare repository, and
# the checked-out branch is pushed to, then update the working copy.
# This makes "push" function somewhat similarly to darcs and bzr.
#
# To enable this hook, make this file executable by "chmod +x post-update".
git-update-server-info
is_bare=$(git-config --get --bool core.bare)
if [ -z "$is_bare" ]
then
# for compatibility's sake, guess
git_dir_full=$(cd $GIT_DIR; pwd)
case $git_dir_full in */.git) is_bare=false;; *) is_bare=true;; esac
fi
update_wc() {
ref=$1
echo "Push to checked out branch $ref" >&2
if [ ! -f $GIT_DIR/logs/HEAD ]
then
echo "E:push to non-bare repository requires a HEAD reflog" >&2
exit 1
fi
if (cd $GIT_WORK_TREE; git-diff-files -q --exit-code >/dev/null)
then
wc_dirty=0
else
echo "W:unstaged changes found in working copy" >&2
wc_dirty=1
desc="working copy"
fi
if git diff-index --cached HEAD@{1} >/dev/null
then
index_dirty=0
else
echo "W:uncommitted, staged changes found" >&2
index_dirty=1
if [ -n "$desc" ]
then
desc="$desc and index"
else
desc="index"
fi
fi
if [ "$wc_dirty" -ne 0 -o "$index_dirty" -ne 0 ]
then
new=$(git rev-parse HEAD)
echo "W:stashing dirty $desc - see git-stash(1)" >&2
( trap 'echo trapped $$; git symbolic-ref HEAD "'"$ref"'"' 2 3 13 15 ERR EXIT
git-update-ref --no-deref HEAD HEAD@{1}
cd $GIT_WORK_TREE
git stash save "dirty $desc before update to $new";
git-symbolic-ref HEAD "$ref"
)
fi
# eye candy - show the WC updates :)
echo "Updating working copy" >&2
(cd $GIT_WORK_TREE
git-diff-index -R --name-status HEAD >&2
git-reset --hard HEAD)
}
if [ "$is_bare" = "false" ]
then
active_branch=`git-symbolic-ref HEAD`
export GIT_DIR=$(cd $GIT_DIR; pwd)
GIT_WORK_TREE=${GIT_WORK_TREE-..}
for ref
do
if [ "$ref" = "$active_branch" ]
then
update_wc $ref
fi
done
fi
为此,您仍然需要使用以下任一配置设置专门允许将更改推送到当前分支:
git config receive.denyCurrentBranch ignore
或
git config receive.denyCurrentBranch warn
答案 2 :(得分:11)
我有完全相同的问题。在对此链接的回复中:http://toroid.org/ams/git-website-howto - 以下命令已完成此操作:
sudo chmod +x hooks/post-receive
我们错过了首先配置这些内容的sudo
权限。
答案 3 :(得分:6)
VonC脚本的修正版本适合我(绝对没有保证)。
#!/bin/sh
#
# This hook does two things:
#
# 1. update the "info" files that allow the list of references to be
# queries over dumb transports such as http
#
# 2. if this repository looks like it is a non-bare repository, and
# the checked-out branch is pushed to, then update the working copy.
# This makes "push" function somewhat similarly to darcs and bzr.
#
# To enable this hook, make this file executable by "chmod +x post-update".
set -e
git update-server-info
is_bare=$(git config --get --bool core.bare)
if [ -z "${is_bare}" ]
then
# for compatibility's sake, guess
git_dir_full=$(cd $GIT_DIR; pwd)
case $git_dir_full in */.git) is_bare=false;; *) is_bare=true;; esac
fi
update_wc() {
ref=$1
echo "Push to checked out branch $ref" >&2
if [ ! -f ${GIT_DIR}/logs/HEAD ]
then
echo "E:push to non-bare repository requires a HEAD reflog" >&2
exit 1
fi
if (cd ${GIT_WORK_TREE}; git diff-files -q --exit-code >/dev/null)
then
wc_dirty=0
else
echo "W:unstaged changes found in working copy" >&2
wc_dirty=1
desc="working copy"
fi
if git diff-index --cached HEAD@{1} >/dev/null
then
index_dirty=0
else
echo "W:uncommitted, staged changes found" >&2
index_dirty=1
if [ -n "$desc" ]
then
desc="$desc and index"
else
desc="index"
fi
fi
if [ "$wc_dirty" -ne 0 -o "$index_dirty" -ne 0 ]
then
new=$(git rev-parse HEAD)
echo "W:stashing dirty $desc - see git-stash(1)" >&2
( trap 'echo trapped $$; git symbolic-ref HEAD "'"$ref"'"' 2 3 13 15 ERR EXIT
git update-ref --no-deref HEAD HEAD@{1}
cd ${GIT_WORK_TREE}
git stash save "dirty $desc before update to $new";
git symbolic-ref HEAD "$ref"
)
fi
# eye candy - show the WC updates :)
echo "Updating working copy" >&2
(cd ${GIT_WORK_TREE}
git diff-index -R --name-status HEAD >&2
git reset --hard HEAD
# need to touch some files or restart the application? do that here:
# touch *.wsgi
)
}
if [ x"${is_bare}" = x"false" ]
then
active_branch=$(git symbolic-ref HEAD)
export GIT_DIR=$(cd ${GIT_DIR}; pwd)
GIT_WORK_TREE="${GIT_DIR}/.."
for ref in $(cat)
do
if [ x"$ref" = x"${active_branch}" ]
then
update_wc $ref
fi
done
fi
答案 4 :(得分:6)
设置此git部署的简单脚本:
准备收件后挂钩:
echo '#!/bin/sh' > .git/hooks/post-receive
echo 'git checkout -f' >> .git/hooks/post-receive
echo 'git reset --hard' >> .git/hooks/post-receive
chmod +x .git/hooks/post-receive
允许推入此存储库,尽管它不是裸露的:
git config receive.denycurrentbranch false
答案 5 :(得分:1)