Sign in

Search issue titles and bodies, change requests and comments. Private repositories you cannot read are not included.

vole
Clone

Read only, no credentials:

https://rodent.software/git/vole.git

Write over SSH with a registered key:

git clone ssh://git@0.0.0.0:2222/vole.git

A free and open-source forge that lives in your Git repo.

Test the merge result before landing it

e5478085e5b53a2892d0649d6f07c6f0a5653378 · Keenan Nemetz · 11d ago · parent db5e4382

Test the merge result before landing it

A protected branch could receive a non-fast-forward landing whose tree was
never built: the gate asked for checks on the request head, and the merge
commit was made at landing time. A pushed merge with the right parents but
extra content was accepted too.

Publish the merge commit under refs/vole/candidates/, test it as the base
branch, and make the gate require its results. Approvals name the head and
the base branch, so a moved base retests without a new approval. A merger
who clicks while that run is still going waits for it instead of clicking
again. A pushed merge commit now has to carry exactly the tree a clean merge
would produce.

Closes: 01M61QQ56TESQ1HTMB1Z5C3733

docs/cli.md +6

@@ -178,6 +178,7 @@ vole change edit-comment <id> <comment-id> [-m <text> | -F <file>]
178 178 vole change rm-comment <id> <comment-id>
179 179 vole change update <id> [--base <branch>] [--head <rev>] [--closes <issue>]... [--no-closes]
180 180 vole change approve <id> [--as <account>]
181 vole change merge <id>
181 182 vole change close <id>
182 183 vole change reopen <id>
183 184 ```
@@ -193,6 +194,11 @@ open request, which is how a stacked request moves onto `main` after the branch
193 194 below it lands; approvals named the old base and stop counting. See
194 195 [Change requests](change-requests.md).
195 196
197 `change merge` lands the request. When the combined result is still building it
198 prints that the request will merge when the result passes, which is the same
199 "merge when ready" a click on the page arms. `change show` prints the combined
200 result and whether the landing is ready.
201
196 202 ## Releases
197 203
198 204 ```sh