Merge changes I2fb1cd15,I78afe991,Ifdbac1bc,I0f693c63,I378d3845, ...
* changes:
CreateTag: Trim revision that is provided in input
CreateTag: Allow revision in input to be empty
RefUtil#parseBaseRevision: Do not log an error if baseRevision is invalid
InvalidRevisionException: Include invalid revision into message
CreateBranch: Trim revision that is provided in input
CreateBranch: Allow revision in input to be empty
CreateBranchIT: Add tests that set revision in the input
diff --git a/javatests/com/google/gerrit/acceptance/api/change/AbandonIT.java b/javatests/com/google/gerrit/acceptance/api/change/AbandonIT.java
index abfc23d..7ecbe69 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/AbandonIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/AbandonIT.java
@@ -179,15 +179,15 @@
assertThat(toChangeNumbers(query("is:abandoned"))).containsExactly(id4);
}
+ /**
+ * When indexMergeable is disabled then the abandonIfMergeable option is ineffective and the auto
+ * abandon behaves as though it were set to its default value (true).
+ */
@Test
@UseClockStep
@GerritConfig(name = "changeCleanup.abandonAfter", value = "1w")
@GerritConfig(name = "changeCleanup.abandonIfMergeable", value = "false")
@GerritConfig(name = "index.change.indexMergeable", value = "false")
- /**
- * When indexMergeable is disabled then the abandonIfMergeable option is ineffective and the auto
- * abandon behaves as though it were set to its default value (true).
- */
public void abandonedIfMergeableWhenMergeableOperatorIsDisabled() throws Exception {
ObjectId initial = repo().exactRef(HEAD).getLeaf().getObjectId();
