From dae38f797e57a98145aa6293b5334454e976039e Mon Sep 17 00:00:00 2001 From: Lex Christopherson Date: Tue, 24 Mar 2026 15:16:03 -0600 Subject: [PATCH] fix(test): normalize CRLF in auto-stash-merge assertion for Windows Co-Authored-By: Claude Opus 4.6 (1M context) --- src/resources/extensions/gsd/tests/auto-stash-merge.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/extensions/gsd/tests/auto-stash-merge.test.ts b/src/resources/extensions/gsd/tests/auto-stash-merge.test.ts index 1aa2a6a1d..40a732acc 100644 --- a/src/resources/extensions/gsd/tests/auto-stash-merge.test.ts +++ b/src/resources/extensions/gsd/tests/auto-stash-merge.test.ts @@ -81,7 +81,7 @@ test("#2151 bug 1: auto-stash unblocks merge when unrelated files are dirty", () // Verify the dirty file was restored (stash popped). const readmeContent = readFileSync(join(repo, "README.md"), "utf-8"); - assert.equal(readmeContent, "# modified locally\n", "stash popped — dirty file restored after merge"); + assert.equal(readmeContent.replace(/\r\n/g, "\n"), "# modified locally\n", "stash popped — dirty file restored after merge"); } finally { try { rmSync(repo, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 }); } catch { /* Windows EPERM: git holds locks on .git files */ } }