jb/paseo
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Recover branch during rebase

Browse Source
This commit is contained in:
Mohamed Boudra
2026-04-22 18:35:01 +07:00
parent 637109eab0
commit 407b4b68b0
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/utils/checkout-git.test.ts
+18
View File
@@ -194,6 +194,24 @@ describe("checkout git utilities", () => {
expect(branch).toBeNull();
});
it("returns the branch being rebased when HEAD is detached during a rebase", async () => {
execSync("git checkout -b feature/rebase-test", { cwd: repoDir });
writeFileSync(join(repoDir, "file.txt"), "feature\n");
execSync("git add file.txt", { cwd: repoDir });
execSync("git -c commit.gpgsign=false commit -m 'feature change'", { cwd: repoDir });
execSync("git checkout main", { cwd: repoDir });
writeFileSync(join(repoDir, "file.txt"), "main\n");
execSync("git add file.txt", { cwd: repoDir });
execSync("git -c commit.gpgsign=false commit -m 'main change'", { cwd: repoDir });
execSync("git checkout feature/rebase-test", { cwd: repoDir });
expect(() => execSync("git rebase main", { cwd: repoDir, stdio: "pipe" })).toThrow();
const branch = await getCurrentBranch(repoDir);
expect(branch).toBe("feature/rebase-test");
});
it("handles status/diff/commit in a normal repo", async () => {
writeFileSync(join(repoDir, "file.txt"), "updated\n");