Skip to content
TypeScript

fix(server): new projects are created when core.safecrlf refuses LF files (#29843)

Alex Southwell9f7b2ee93ccb
diff --git a/apps/server/src/project/ManagedProjectFolders.test.ts b/apps/server/src/project/ManagedProjectFolders.test.ts
index b5e3ef9a13b..7990537355e 100644
--- a/apps/server/src/project/ManagedProjectFolders.test.ts
+++ b/apps/server/src/project/ManagedProjectFolders.test.ts
@@ -349,6 +349,12 @@ it.effect("starts a named project as a committed repository, and suffixes a take
const path = yield* Path.Path;
const root = path.resolve(baseDir, "projects");
assert.equal(folders.namedProjectsRoot, root);
+ const attributes = path.join(baseDir, "crlf.gitattributes");
+ const crlfConfig = path.join(baseDir, "crlf.gitconfig");
+ yield* fileSystem.writeFileString(attributes, "* text=auto eol=crlf\n");
+ yield* git(baseDir, ["config", "--file", crlfConfig, "core.safecrlf", "true"]);
+ yield* git(baseDir, ["config", "--file", crlfConfig, "core.attributesFile", attributes]);
+ process.env.GIT_CONFIG_GLOBAL = crlfConfig;
const first = yield* folders.createNamedProject({ name: "Pinball Stats" });
const second = yield* folders.createNamedProject({ name: "pinball stats" });
diff --git a/apps/server/src/project/ManagedProjectFolders.ts b/apps/server/src/project/ManagedProjectFolders.ts
index c187424870c..4b0991e1a64 100644
--- a/apps/server/src/project/ManagedProjectFolders.ts
+++ b/apps/server/src/project/ManagedProjectFolders.ts
@@ -395,11 +395,12 @@ const make = Effect.gen(function* () {
path.join(cwd, "assets", "icon.svg"),
namedProjectIconSvg(name),
);
- // Force explicit filenames so global ignore rules cannot drop them.
+ // Force explicit filenames so global ignore rules cannot drop them, and keep
+ // core.safecrlf=true from refusing the LF files under CRLF conversion.
yield* git.execute({
operation: "ManagedProjectFolders.add",
cwd,
- args: ["add", "--force", "--", "README.md", "assets/icon.svg"],
+ args: ["-c", "core.safecrlf=false", "add", "--force", "--", "README.md", "assets/icon.svg"],
timeoutMs: 10_000,
});
return yield* git