Revert "easy install: needs a minor fix to accommodate auto-vivification"
This reverts commit6576e82e33
. On oddball configs, where the shell key is reused as the gitolite key by smart( people|-alecks), the ls-remote stops the program dead, preventing the "git add" and "git commit" that seed the admin repo. This makes extra work in terms of fixing it after the fact; removing it makes the install go further, and all you need to do is (1) delete the first line from ~/.ssh/authorized_keys on the server and (2) back on the client do a "git clone gitolite:gitolite-admin". OK so it needs to be removed. Explaining that was the easy part! The hard part is explaining why removing it is harmless. Look at the commit tree around that commit, and see that the commit before that (b78a720
) was partially reverted ine7e6085
.b78a720
removed the new_repo call from compile, forcing it to happen only on auth, which forced this workaround for seeding the admin repo. Sincee7e6085
reverted that part ofb78a720
, giving back new_repo functions to compile, this line of code wasn't doing any good. QED and all that :)
This commit is contained in:
parent
79647078a3
commit
ab3c861241
|
@ -401,7 +401,6 @@ setup_pta() {
|
|||
# Substitute $GL_ADMINDIR and $REPO_BASE appropriately. Note there is no
|
||||
# space around the "=" in the second and third lines.
|
||||
|
||||
git ls-remote gitolite:gitolite-admin
|
||||
echo "cd $REPO_BASE/gitolite-admin.git
|
||||
GIT_WORK_TREE=$GL_ADMINDIR git add conf/gitolite.conf keydir
|
||||
GIT_WORK_TREE=$GL_ADMINDIR git diff --cached --quiet || GIT_WORK_TREE=$GL_ADMINDIR git commit -am start
|
||||
|
|
Loading…
Reference in a new issue