opendev/gerrit
Code Issues Proposed changes

Don't allow users to amend commits made by Gerrit Code Review

Browse Source 
All too often I'm seeing users update their project, make a new change,
then amend the current HEAD commit to record the change, rather than
creating a new commit.  By amending the HEAD commit they are often
amending a merge commit created by Gerrit Code Review, and then they
expect this to merge into the repository somehow when they submit
the change.  This is completely incorrect usage and apparently some
users cannot be trusted to not do it.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-07-18 13:40:01 -07:00
parent d38d9ea9f4
commit 3d1c0ee3ea
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/google/gerrit/server/ssh/Receive.java
View File

@@ -1092,9 +1092,23 @@ class Receive extends AbstractGitCommand {
}
private boolean validCommitter(final ReceiveCommand cmd, final RevCommit c) {
final PersonIdent committer = c.getCommitterIdent();
final PersonIdent author = c.getAuthorIdent();
// Don't allow the user to amend a merge created by Gerrit Code Review.
// This seems to happen all too often, due to users not paying any
// attention to what they are doing.
//
final PersonIdent serverIdent = server.newGerritPersonIdent();
if (c.getParentCount() > 1
&& author.getName().equals(serverIdent.getName())
&& author.getEmailAddress().equals(serverIdent.getEmailAddress())) {
reject(cmd, "do not amend merges not made by you");
return false;
}
// Require that committer matches the uploader.
//
final PersonIdent committer = c.getCommitterIdent();
if (!myEmails.contains(committer.getEmailAddress())) {
reject(cmd, "you are not committer " + committer.getEmailAddress());
return false;
@@ -1104,7 +1118,6 @@ class Receive extends AbstractGitCommand {
// If the project wants Signed-off-by / Acked-by lines, verify we
// have them for the blamable parties involved on this change.
//
final PersonIdent author = c.getAuthorIdent();
boolean sboAuthor = false, sboCommitter = false, sboMe = false;
for (final FooterLine footer : c.getFooterLines()) {
if (footer.matches(FooterKey.SIGNED_OFF_BY)) {