vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-07-19 02:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(pr): support rebase landings

Browse Source
This commit is contained in:
Vincent Koc
2026-07-10 17:21:59 -07:00
committed by Vincent Koc
parent 6f9afda10c
commit 90ad9251df
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/pr
View File

@@ -72,7 +72,7 @@ Usage:
scripts/pr prepare-run <PR>
scripts/pr merge-verify <PR>
scripts/pr merge-run <PR>
OPENCLAW_PR_MERGE_METHOD=merge preserves the PR commit series.
OPENCLAW_PR_MERGE_METHOD=merge|rebase preserves the PR commit series.
USAGE
}

6
scripts/pr-lib/merge.sh
View File

@@ -245,8 +245,12 @@ merge_run() {
merge_flag="--merge"
merge_label="merge commit"
;;
rebase)
merge_flag="--rebase"
merge_label="rebase"
;;
*)
echo "Invalid OPENCLAW_PR_MERGE_METHOD: $merge_method (expected squash or merge)."
echo "Invalid OPENCLAW_PR_MERGE_METHOD: $merge_method (expected squash, merge, or rebase)."
exit 2
;;
esac

4
test/scripts/pr-wrappers.test.ts
View File

@@ -35,13 +35,13 @@ describe("scripts/pr wrappers", () => {
expect(script).toContain('exec "$base" merge-run "$pr"');
});
it("defaults to squash and allows an explicit merge commit", () => {
it("defaults to squash and allows commit-preserving merge methods", () => {
const script = readScript("scripts/pr-lib/merge.sh");
expect(script).toContain("OPENCLAW_PR_MERGE_METHOD:-squash");
expect(script).toContain("--squash");
expect(script).toContain("--merge");
expect(script).not.toContain("--rebase");
expect(script).toContain("--rebase");
expect(script).toContain('echo "Merged via $merge_label."');
});