Last modified: 2013-04-24 11:42:57 UTC

Wikimedia Bugzilla is closed!

Wikimedia migrated from Bugzilla to Phabricator. Bug reports are handled in Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See T47332, the corresponding Phabricator task for complete and up-to-date bug report information.
Bug 45332 - Include who approved a change in jenkins merges
Include who approved a change in jenkins merges
Status: RESOLVED WORKSFORME
Product: Wikimedia
Classification: Unclassified
Git/Gerrit (Other open bugs)
unspecified
All All
: Normal enhancement (vote)
: ---
Assigned To: Nobody - You can work on this!
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2013-02-24 14:44 UTC by Platonides
Modified: 2013-04-24 11:42 UTC (History)
6 users (show)

See Also:
Web browser: ---
Mobile Platform: ---
Assignee Huggle Beta Tester: ---


Attachments

Description Platonides 2013-02-24 14:44:04 UTC
Merges have now jenkins as author and a commit message of:
 Merge "Commit short description"

It would be nice if it also included who approved the changeset in the commit message (or even a summary of the votes). Yes, it's available as notes, but it would be simpler to have it recorded in the merge.

Not sure if it can simply be done at jenkins or if it also needs support from gerrit.
Comment 1 Chad H. 2013-02-24 17:15:05 UTC
Easiest solution would be to change the default from "Merge if Necessary" to "Fast-Forward Only." Then we'd never end up with "Merge 'foo'" commits at all.
Comment 2 Antoine "hashar" Musso (WMF) 2013-04-24 11:36:39 UTC
> It would be nice if it also included who approved the changeset
> in the commit message (or even a summary of the votes).

The way to handle that is by setting the repository to uses the Cherry-Pick strategy. When Gerrit is requested to merge a change, it will update the commit summary listing the votes and merge the result commit.  That does change the sha1 though.

So to me this bug is not Jenkins related but Gerrit related and it can be enabled on a per repo basis if needed.  Thus, I am closing this bug report :)
Comment 3 Chad H. 2013-04-24 11:42:57 UTC
Changing sha1s is bad, so let's please not do that.

Note You need to log in before you can comment on or make changes to this bug.


Navigation
Links