[ovirt-devel] Gerrit headers are not added to commits in vdsm repo

[Barak Korren]

On 25 November 2016 at 16:57, Nir Soffer <nsoffer at redhat.com> wrote:
> On Fri, Nov 25, 2016 at 4:45 PM, Tomáš Golembiovský <tgolembi at redhat.com> wrote:
>> Hi,
>>
>> I've noticed that in vdsm repo the merged commits do not contain the
>> info headers added by Gerrit any more (Reviewed-by/Reviewed-on/etc.).
>>
>> Is that intentional? If yes, what was the motivation behind this?
>>
>> The change seem to have happened about 4 days ago. Sometime between the
>> following two commits:
>>
>> * 505f5da  API: Introduce getQemuImageInfo API. [Maor Lipchuk]
>> * 1c4a39c  protocoldetector: Avoid unneeded getpeername() [Nir Soffer]
>
> We switched vdsm to fast-forward 4 days ago, maybe this was unintended
> side effect of this change?
>
> The gerrit headers are very useful, please add back.
>

Headers cannot be added in fast-forward mode b/c then you end up with
a new commit hash - not fast forwarding to an existing commit.

In other words - headers are only added when Gerrit creates a new
commit - which in FF mode it never does.

I could move the project to "Rebase Always" which is like "Rebase if
Necessary" but always creates a new commit (with headers). Please note
that this is less strict then ff-only and therefore would lead to
merged combinations that do not get tested in CI.

-- 
Barak Korren
bkorren at redhat.com
RHEV-CI Team