opendev/gerrit
Code Issues Proposed changes

Remove unused 'skip' member of ReceiveCommits#ReplaceRequest

Browse Source 
Change-Id: Iaa2a4394278a82c6dfdb3c2d26e6ca7669a703f6
This commit is contained in:
Han-Wen Nienhuys
2018-08-13 17:46:05 +02:00
parent 8a3d0e1bd4
commit 4b90f147e2
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -661,7 +661,7 @@ class ReceiveCommits {
replaceByChange replaceByChange
.values() .values()
.stream() .stream()
.filter(r -> !r.skip && r.inputCommand.getResult() == OK) .filter(r -> r.inputCommand.getResult() == OK)
.sorted(comparingInt(r -> r.notes.getChangeId().get())) .sorted(comparingInt(r -> r.notes.getChangeId().get()))
.collect(toList()); .collect(toList());
if (!updated.isEmpty()) { if (!updated.isEmpty()) {
@@ -2322,9 +2322,6 @@ class ReceiveCommits {
ReplaceRequest req = itr.next(); ReplaceRequest req = itr.next();
if (req.inputCommand.getResult() == NOT_ATTEMPTED) { if (req.inputCommand.getResult() == NOT_ATTEMPTED) {
req.validate(false); req.validate(false);
if (req.skip && req.cmd == null) {
itr.remove();
}
} }
} }
} catch (OrmException err) { } catch (OrmException err) {
@@ -2383,7 +2380,6 @@ class ReceiveCommits {
ReceiveCommand prev; ReceiveCommand prev;
ReceiveCommand cmd; ReceiveCommand cmd;
PatchSetInfo info; PatchSetInfo info;
boolean skip;
private PatchSet.Id priorPatchSet; private PatchSet.Id priorPatchSet;
List<String> groups = ImmutableList.of(); List<String> groups = ImmutableList.of();
private ReplaceOp replaceOp; private ReplaceOp replaceOp;