Fix create-app educational commit flow

cursoragent · cursoragent · commit f6ad2a0abdbc · 2026-03-25T21:56:34.000Z
diff --git a/packages/create-react-on-rails-app/src/create-app.ts b/packages/create-react-on-rails-app/src/create-app.ts
@@ -211,14 +211,19 @@ function gitHasPendingChanges(appPath: string): boolean {
 }
 
 function createEducationalCommit(appPath: string, subject: string, body: string): void {
-  ensureGitRepository(appPath);
+  try {
+    ensureGitRepository(appPath);
 
-  if (!gitHasPendingChanges(appPath)) {
-    return;
-  }
+    if (!gitHasPendingChanges(appPath)) {
+      return;
+    }
 
-  execLiveArgs('git', ['add', '-A'], appPath);
-  execLiveArgs('git', ['commit', '-m', subject, '-m', body], appPath, educationalGitEnv(appPath));
+    execLiveArgs('git', ['add', '-A'], appPath);
+    execLiveArgs('git', ['commit', '-m', subject, '-m', body], appPath, educationalGitEnv(appPath));
+  } catch (error) {
+    const message = error instanceof Error ? error.message : 'unknown git error';
+    logInfo(`Skipping educational commit "${subject}" due to git error: ${message}`);
+  }
 }
 
 function railsBaselineCommitMessage(): { subject: string; body: string } {
@@ -351,7 +356,7 @@ export function createApp(appName: string, options: CliOptions): void {
   // so it's always a simple directory name safe to use with rails new.
   logStep(currentStep, totalSteps, 'Creating Rails application...');
   try {
-    execLiveArgs('rails', ['new', appName, '--database=postgresql', '--skip-javascript']);
+    execLiveArgs('rails', ['new', appName, '--database=postgresql', '--skip-javascript', '--skip-git']);
     const { subject, body } = railsBaselineCommitMessage();
     createEducationalCommit(appPath, subject, body);
     logStepDone('Rails application created');
diff --git a/packages/create-react-on-rails-app/tests/create-app.test.ts b/packages/create-react-on-rails-app/tests/create-app.test.ts
@@ -270,6 +270,7 @@ describe('createApp', () => {
       'my-app',
       '--database=postgresql',
       '--skip-javascript',
+      '--skip-git',
     ]);
     expect(mockedExecLiveArgs).toHaveBeenNthCalledWith(
       4,
@@ -309,6 +310,7 @@ describe('createApp', () => {
       'my-app',
       '--database=postgresql',
       '--skip-javascript',
+      '--skip-git',
     ]);
     expect(mockedExecLiveArgs).toHaveBeenNthCalledWith(
       4,
@@ -365,6 +367,7 @@ describe('createApp', () => {
       'my-app',
       '--database=postgresql',
       '--skip-javascript',
+      '--skip-git',
     ]);
     expect(mockedExecLiveArgs).toHaveBeenNthCalledWith(
       4,
@@ -391,6 +394,23 @@ describe('createApp', () => {
     expect(processExitSpy).not.toHaveBeenCalled();
   });
 
+  it('continues app creation when an educational commit fails', () => {
+    const appPath = path.resolve(process.cwd(), 'my-app');
+    mockedExecLiveArgs.mockImplementation((command, args) => {
+      if (command === 'git' && args[0] === 'commit' && args[2] === 'Create Rails app with PostgreSQL') {
+        throw new Error('hook rejected commit');
+      }
+    });
+
+    createApp('my-app', baseOptions);
+
+    expect(processExitSpy).not.toHaveBeenCalled();
+    expect(mockedFs.rmSync).not.toHaveBeenCalledWith(appPath, { recursive: true, force: true });
+    expect(mockedLogInfo).toHaveBeenCalledWith(
+      expect.stringContaining('Skipping educational commit "Create Rails app with PostgreSQL" due to git error'),
+    );
+  });
+
   it('converts pnpm scaffolds away from npm artifacts', () => {
     const appPath = path.resolve(process.cwd(), 'my-app');
     const packageJsonPath = path.join(appPath, 'package.json');
