Bugzilla – Full Text Bug Listing
| Summary: | Wrong author on commit accepted via gerrit | ||
|---|---|---|---|
| Product: | Community | Reporter: | John Arthorne <john.arthorne> |
| Component: | Gerrit | Assignee: | Eclipse Webmaster <webmaster> |
| Status: | RESOLVED INVALID | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | daniel_megert, markus.kell.r, pwebster, thanh.ha |
| Version: | unspecified | ||
| Target Milestone: | --- | ||
| Hardware: | PC | ||
| OS: | Windows 7 | ||
| See Also: | https://bugs.eclipse.org/bugs/show_bug.cgi?id=373748 | ||
| Whiteboard: | |||
|
Description
John Arthorne
I've seen it keep the author correct, but that seems to be if the patch is already at the tip of master. If it's not and Gerrit rebases the commit when it merges it in, it seems to replace the author. But I'm not 100% sure, I'll test it later. PW See bug 401933 comment #4 Is this a per-project setting, or configured for all projects on our Gerrit instance? PW Our default is "Merge if Necessary", see http://gerrit.googlecode.com/svn/documentation/2.1/project-setup.html#submit_type John, is this the kind of thing we want set to "Fast Forward Only"? PW (In reply to comment #0) > Brian de Alwis authored this change and pushed it to gerrit for review: > > https://git.eclipse.org/r/#/c/10992/ > > I reviewed the change, and then click "Accept and Submit" from the gerrit > review web page. Now when I look at the commit in master, it shows the > author as me, but I didn't author the change: As Brian mentioned in the other bug, that's the merge commit (and his is still in there). PW Yep sorry for the noise. I wasn't expecting a merge commit there. (In reply to comment #3) > Our default is "Merge if Necessary", see > http://gerrit.googlecode.com/svn/documentation/2.1/project-setup. > html#submit_type > > John, is this the kind of thing we want set to "Fast Forward Only"? > > PW This is probably not the place to discuss it, but gerrit doing auto-merge is kind of scary. It means Gerrit is releasing into master a combination of commits that has never been tested together. I usually avoid merge, but when it makes sense I like to at least test to ensure all the changes work together properly. > This is probably not the place to discuss it, but gerrit doing auto-merge is
> kind of scary. It means Gerrit is releasing into master a combination of
> commits that has never been tested together.
I agree that's scary. We should only allow safe commits ("Fast Forward Only"), like we already do without Gerrit.
(In reply to comment #7) > > This is probably not the place to discuss it, but gerrit doing auto-merge is > > kind of scary. It means Gerrit is releasing into master a combination of > > commits that has never been tested together. > > I agree that's scary. We should only allow safe commits ("Fast Forward > Only"), like we already do without Gerrit. I think a new bug should be opened listing all the repos that should be changed to "Fast Forward Only" if this is the case. (In reply to comment #8) > (In reply to comment #7) > > > This is probably not the place to discuss it, but gerrit doing auto-merge is > > > kind of scary. It means Gerrit is releasing into master a combination of > > > commits that has never been tested together. > > > > I agree that's scary. We should only allow safe commits ("Fast Forward > > Only"), like we already do without Gerrit. > > I think a new bug should be opened listing all the repos that should be > changed to "Fast Forward Only" if this is the case. I suggest to do this for all Gerrit instances of the Eclipse top-level project. Let's discuss this in our next PMC meeting. |