Re: Disallow amending published commits?

From: Peter Harris <git@peter.is-a-geek.org>
Date: Mar 22, 2009, 02:57 UTC
Message-ID: <eaa105840903211957g634f119bkf3e5adbc5d475793@mail.gmail.com>
In-Reply-To: <eaa105840903211853p65327ffdvebbe28da5f256871@mail.gmail.com>

On Sat, Mar 21, 2009 at 9:53 PM, Peter Harris wrote:

Show 17 quoted lines

> On Sat, Mar 21, 2009 at 6:49 PM, James Pickens wrote:
>> On Sat, Mar 21, 2009, Peter Harris <git@peter.is-a-geek.org> wrote:
>>> Set receive.denyNonFastForwards if you don't want people to be able to
>>> amend (or otherwise rewind) published history.
>>
>> Thanks, but unfortunately that won't work in our workflow.  Users never
>> push their changes; instead, they do a turnin to a continuous integration
>> server.  The server clones the central repo, pulls their changes into the
>> clone, builds and tests it, then pushes to the central repo if it passes
>> the tests.  So integration happens via 'pull' instead of 'push'.
>>
>> We can't force the pulls to be fast forward only, because we need to allow
>> turnins from multiple users to be built and tested in parallel, without
>> requiring users to pull from each other or otherwise coordinate their
>> turnins.
>
> Okay. So in that workflow, you won't ever lose the original history.

(Replying to myself, since I thought of one other thing)

You could, if you wanted, 'pull' into a clean branch. Ensure that it was a fast-forward, and only then merge the result into the integration branch. Developers would have to sync-up with the central repo, but at least they wouldn't have to sync with each other.

Peter Harris