diff options
| author | Ismo Haataja <ismo.haataja@digia.com> | 2014-06-14 14:15:51 +0300 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-20 19:25:46 +0200 |
| commit | a364a92d92b0e00ab24a6e328b472d858f236f60 (patch) | |
| tree | 4fffd224e1adfadb86c53df63f42683da6a08465 /gerrit-server | |
| parent | dc0bbfca11accc222a0dfdb2b3e654b5b712bd12 (diff) | |
Fix unstaging a STAGING change
Allowed unstaging also from STAGING state in database update function.
Without this, state was not changed at all even though "Unstaged" change
message was posted. Because change was not moved to NEW state as expected,
this also caused an error message complaining about incorrect state.
Task-number: QTQAINFRA-857
Change-Id: Iea359597584991fb6da17a72cf0c400970cafda6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Ismo Haataja <ismo.haataja@digia.com>
Diffstat (limited to 'gerrit-server')
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java index 2b3572f9db..c01caa9dbd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java @@ -580,6 +580,7 @@ public class ChangeUtil { @Override public Change update(Change change) { if (change.getStatus() == Change.Status.INTEGRATING + || change.getStatus() == Change.Status.STAGING || change.getStatus() == Change.Status.STAGED) { change.setStatus(Change.Status.NEW); ChangeUtil.updated(change); |