Re: Bring together merge and rebase

From: Martin Fick <mfick@codeaurora.org>
Date: Jan 4, 2018, 20:06 UTC
Message-ID: <45915667.ye9M3CbBo5@mfick-lnx>
In-Reply-To: <20171226203153.GA21429@Carl-MBP.ecbaldwin.net>

On Tuesday, December 26, 2017 01:31:55 PM Carl Baldwin wrote: ...

> What I propose is that gerrit and github could end up more
> robust, featureful, and interoperable if they had this
> feature to build from.

I agree (assuming we come up with a well defined feature)

Show 5 quoted lines

> With gerrit specifically, adopting this feature would make
> the "change" concept richer than it is now because it
> could supersede the change-id in the commit message and
> allow a change to evolve in a distributed non-linear way
> with protection against clobbering work.

We (the Gerrit maintainers) would like changes to be able to evolve non-linearly so that we can eventually support distributed Gerrit reviews, and the amended-commit pointer is one way I have thought to resolve this.

Show 8 quoted lines

> I have no intention to disparage either tool. I love them
> both. They've both made my career better in different
> ways. I know there is no guarantee that github, gerrit,
> or any other tool will do anything to adopt this. But,
> I'm hoping they are reading this thread and that they
> recognize how this feature can make them a little bit
> better and jump in and help. I know it is a lot to hope
> for but I think it could be great if it happened.

We (the Gerrit maintainers) do recognize it, and I am glad that someone is pushing for solutions in this space. I am not sure what the right solution is, and how to modify workflows to deal better with this. I do think that starting by making your local repo track pointers to amended-commits, likely with various git hooks and notes (as also proposed by Johannes Schindelin), would be a good start. With that in place, then you can attack various specific workflows.

If you want to then attack the Gerrit workflow, it would be good if you could prevent pushing new patchests that are amended versions of patchsets that are out of date. While it would be great if Gerrit could reject such pushes, I wonder if to start, git could detect and it prevent the push in this situation? Could a git push hook analyze the ref advertisements and figure this out (all the patchsets are in the advertisement)? Can a git hook look at the ref advertisement?

-Martin

-- 
The Qualcomm Innovation Center, Inc. is a member of Code 
Aurora Forum, hosted by The Linux Foundation