opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  ReceiveCommits: Validate ref operation before commits for non-ff case
  Add test coverage for ref operation validation extension point
  Upgrade JGit to 4.11.8.201904181247-r
  CreateProject: Expose createProject method
  ElasticContainer: Switch to Alpine-based images from blacktop
  Bazel: Fix lint warning flagged by buildifier

Change-Id: I43f6b82744788ffe6635abc3c06af57cf0629a5e
This commit is contained in:
Marco Miller
2019-06-25 13:45:33 -04:00
committed by David Pursehouse
parent 8b0339f3ae 97d4b48dd9
commit 0d8a03ba3a
7 changed files with 227 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/com/google/gerrit/server/git/receive/ReceiveCommits.java
View File

@@ -1249,11 +1249,8 @@ class ReceiveCommits {
}
private void parseRewind(ReceiveCommand cmd) throws PermissionBackendException {
RevCommit newObject;
try {
newObject = receivePack.getRevWalk().parseCommit(cmd.getNewId());
} catch (IncorrectObjectTypeException notCommit) {
newObject = null;
receivePack.getRevWalk().parseCommit(cmd.getNewId());
} catch (IOException err) {
logger.atSevere().withCause(err).log(
"Invalid object %s for %s forced update", cmd.getNewId().name(), cmd.getRefName());
@@ -1262,11 +1259,12 @@ class ReceiveCommits {
}
logger.atFine().log("Rewinding %s", cmd);
if (newObject != null) {
validateRegularPushCommits(new Branch.NameKey(project.getNameKey(), cmd.getRefName()), cmd);
if (cmd.getResult() != NOT_ATTEMPTED) {
return;
}
if (!validRefOperation(cmd)) {
return;
}
validateRegularPushCommits(new Branch.NameKey(project.getNameKey(), cmd.getRefName()), cmd);
if (cmd.getResult() != NOT_ATTEMPTED) {
return;
}
Optional<AuthException> err = checkRefPermission(cmd, RefPermission.FORCE_UPDATE);

3
java/com/google/gerrit/server/restapi/project/CreateProject.java
View File

@@ -240,7 +240,8 @@ public class CreateProject
}
}
private ProjectState createProject(CreateProjectArgs args)
// TODO(dpursehouse): Add @UsedAt annotation
public ProjectState createProject(CreateProjectArgs args)
throws BadRequestException, ResourceConflictException, IOException, ConfigInvalidException {
final Project.NameKey nameKey = args.getProject();
try {