diff options
| author | Luca Milanesio <[email protected]> | 2025-07-11 21:33:28 +0100 |
|---|---|---|
| committer | Luca Milanesio <[email protected]> | 2025-07-11 13:38:41 -0700 |
| commit | af223783e75177fdef9f1a3bec09a06a281fe809 (patch) | |
| tree | e31d6897f29d1e3a890c9ed5924a27fd45740e36 | |
| parent | 68b35f3de37c19cbfac298ca300a3ee7a00f433a (diff) | |
| parent | 38ea83f8744a4b0b3601db3a5ebca4e72bbfc83b (diff) | |
Merge branch 'stable-3.4' into stable-3.5upstream/stable-3.5
* stable-3.4:
Align delete refs to the rest of Gerrit
Release-Notes: skip
Change-Id: Ide7432445a82dd30a4c8a50a69b75cba58eaeae3
| -rw-r--r-- | java/com/google/gerrit/server/StarredChangesUtil.java | 1 | ||||
| -rw-r--r-- | java/com/google/gerrit/server/edit/ChangeEditUtil.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/java/com/google/gerrit/server/StarredChangesUtil.java b/java/com/google/gerrit/server/StarredChangesUtil.java index f7193b78b9..cad935b401 100644 --- a/java/com/google/gerrit/server/StarredChangesUtil.java +++ b/java/com/google/gerrit/server/StarredChangesUtil.java @@ -459,6 +459,7 @@ public class StarredChangesUtil { RefUpdate u = repo.updateRef(refName); u.setForceUpdate(true); u.setExpectedOldObjectId(oldObjectId); + u.setNewObjectId(ObjectId.zeroId()); u.setRefLogIdent(serverIdent.get()); u.setRefLogMessage("Unstar change", true); RefUpdate.Result result = u.delete(); diff --git a/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/java/com/google/gerrit/server/edit/ChangeEditUtil.java index 6b018ce2a2..3540081c96 100644 --- a/java/com/google/gerrit/server/edit/ChangeEditUtil.java +++ b/java/com/google/gerrit/server/edit/ChangeEditUtil.java @@ -241,6 +241,7 @@ public class ChangeEditUtil { String refName = edit.getRefName(); RefUpdate ru = repo.updateRef(refName, true); ru.setExpectedOldObjectId(edit.getEditCommit()); + ru.setNewObjectId(ObjectId.zeroId()); ru.setForceUpdate(true); RefUpdate.Result result = ru.delete(); switch (result) { |