fix(maint): keep PR landing on squash · openclaw/openclaw@da15cf4
vincentkoc
·
2026-06-24
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -32,13 +32,13 @@ describe("scripts/pr wrappers", () => {
|
32 | 32 | expect(script).toContain('exec "$base" merge-run "$pr"'); |
33 | 33 | }); |
34 | 34 | |
35 | | -it("uses the repository-approved rebase landing method", () => { |
| 35 | +it("uses the repository-approved squash landing method", () => { |
36 | 36 | const script = readScript("scripts/pr-lib/merge.sh"); |
37 | 37 | |
38 | | -expect(script).toContain("--rebase"); |
39 | | -expect(script).not.toContain("--squash"); |
40 | | -expect(script).toContain("Merged via rebase."); |
41 | | -expect(script).not.toContain("Merged via squash."); |
| 38 | +expect(script).toContain("--squash"); |
| 39 | +expect(script).not.toContain("--rebase"); |
| 40 | +expect(script).toContain("Merged via squash."); |
| 41 | +expect(script).not.toContain("Merged via rebase."); |
42 | 42 | }); |
43 | 43 | |
44 | 44 | it("keeps prepare wrapper modes delegated to the main PR helper", () => { |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。
