Allow modification of the gitolite-admin repository from a different location

[ghost]

Hi,
Currently it is not possible to commit into the gitolite-admin repository from a different location than the gitolite_tmp_dir because the plugin won't be able to push the change. It should at least do a pull before any commits, and maybe rebase (if possible) or reset head and try again in case of conflicts.
Do you think it will be possible ?

[oliverguenther]

It shouldn't be too hard to implement that feature for the plugin (either as default or opt-in). The gitolite-rugged gem has an unused method for pulling in changes from the repository, which does the following two steps

• reset --hard origin/master
• pull origin/master (implemented as fetch + merge, as rugged does not have a one-line pull)

That functionality should be easy to replicate in grit. From the gitolite gem's perspective, the open question is which protocol should be followed when (e.g., reset+pull before commit). As for rebasing, I'm not sure how that may be employed from rugged, I'd have to look into that.

[ghost]

I think that rebasing (or resolving any conflicts) is not necessary, if it reset and pull, then it's fast forward and the only problem is if the repository is modified between a pull and a push. In this case, I think the easiest is to reset + pull and try again.

[n-rodriguez]

Thanks Oliver for your work (oliverguenther/gitolite-rugged@6642941) I'm gonna look at it in the next days.

[tomas-korec]

If you are still looking for a solution, this worked for me: #299 (comment) (first part of the comment).

[n-rodriguez]

I close this issue. The work is already done in gitolite-rugged and integrated in the v0.8 branch.
I don't see the point of duplicating efforts to backport a feature. We need to move forward :)