Re: [Libreoffice] Git server-side hooks

On Thu, 2010-11-18 at 00:57 +0100, Miklos Vajna wrote:
> 1) Non-fastforwards (ie. pushing a rebase) are not allowed in repos at
> all.
>
> 2) In case non-fastforwards are worked around by deleting the branch +
> creating it again, the CIA bot spams the #libreoffice channel. (That
> happened tonight when Kohei updated
> feature/calc-dp-unlimited-fields.) 

Also...

3) When creating a feature branch, by default, the autosetuprebase
option is set to true, which forces rebase when pulling from the master
branch even without the -r switch.  You need to manually specify
--no-rebase to disable rebase.

I'm very concerned about this, because with this setting, pulling from
the master into a feature branch, and push to the remote feature branch
fails (because you rebased).  Worse, when pushing to the remote fails,
git tells you to pull from the remote feature branch, but when you do
that, you lose the merging of the master you just did (bad).

And continuously pulling from the master branch is very common when you
are in a long-term feature branch, and messing up the branch history is
the last thing you want to see happen while the branch is still being
worked on.

The current workaround is to directly edit the .git/config file to
manually remove autosetuprebase=true from every feature branch you have,
but I wouldn't necessarily call it intuitive...

Kohei

-- 
Kohei Yoshida, LibreOffice hacker, Calc
<kyoshida@novell.com>