Jens/ForgeFlow
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 24 Wiki Activity

Release ForgeFlow 0.8.1

Browse Source 
Add advanced Git and deployment workflows, secure backups and auditing, live Gitea integration, desktop notifications, connection validation, and the premium responsive UX refresh.
This commit is contained in:
NuklearRabbit
2026-07-26 00:42:17 +02:00
parent 971896a1d5
commit 4ad698c4eb
47 changed files with 9114 additions and 1648 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/git-integration.test.mjs
+27
View File
@@ -243,3 +243,30 @@ test('repairs a diverged branch by creating a safety branch before resetting to
const backupSha = (await git(['rev-parse', repaired.backupBranch], working)).stdout.trim();
assert.equal(backupSha, localBefore);
});
test('troubleshooter detects and aborts an interrupted merge without discarding committed history', async (t) => {
const root = await fs.mkdtemp(path.join(os.tmpdir(), 'forgeflow-interrupted-merge-'));
t.after(() => fs.rm(root, { recursive: true, force: true }));
await git(['init'], root);
await git(['config', 'user.name', 'ForgeFlow Test'], root);
await git(['config', 'user.email', 'forgeflow@example.invalid'], root);
await fs.writeFile(path.join(root, 'file.txt'), 'base\n');
await git(['add', '.'], root);
await git(['commit', '-m', 'Base'], root);
await git(['checkout', '-b', 'other'], root);
await fs.writeFile(path.join(root, 'file.txt'), 'other\n');
await git(['commit', '-am', 'Other'], root);
await git(['checkout', 'master'], root);
await fs.writeFile(path.join(root, 'file.txt'), 'main\n');
await git(['commit', '-am', 'Main'], root);
await assert.rejects(git(['merge', 'other'], root));
const service = new GitService();
assert.equal(await service.detectInterruptedOperation(root), 'merge');
const result = await service.abortInterruptedOperation(root);
assert.equal(result.aborted, 'merge');
assert.equal(await service.detectInterruptedOperation(root), null);
assert.equal(result.status.clean, true);
const subject = await git(['log', '-1', '--pretty=%s'], root);
assert.equal(subject.stdout.trim(), 'Main');
});