From 25560fb9f82125459fbcf8fe9dab632ad1b644b2 Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Wed, 6 Apr 2022 15:26:00 -0400
Subject: [PATCH] refactor(cli/migrate): check git status as soon as possible

---
 packages/remix-dev/cli/migrate/run.ts | 4 ----
 packages/remix-dev/cli/run.ts         | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/remix-dev/cli/migrate/run.ts b/packages/remix-dev/cli/migrate/run.ts
index 40c25ce6ee2..87119119beb 100644
--- a/packages/remix-dev/cli/migrate/run.ts
+++ b/packages/remix-dev/cli/migrate/run.ts
@@ -33,10 +33,6 @@ export const run = async (input: {
   flags: Flags;
 }) => {
   let projectDir = checkProjectDir(input.projectDir);
-  if (!input.flags.dry) {
-    checkGitStatus(projectDir, { force: input.flags.force });
-  }
-
   let migration = parseMigration(input.migrationId);
   return migration.function({ projectDir, flags: input.flags });
 };
diff --git a/packages/remix-dev/cli/run.ts b/packages/remix-dev/cli/run.ts
index 3899b9ed850..0b85986f5d8 100644
--- a/packages/remix-dev/cli/run.ts
+++ b/packages/remix-dev/cli/run.ts
@@ -7,6 +7,7 @@ import inquirer from "inquirer";
 import * as colors from "../colors";
 import * as commands from "./commands";
 import { validateNewProjectPath, validateTemplate } from "./create";
+import { checkGitStatus } from "./checkGitStatus";
 
 const helpText = `
 ${colors.logoBlue("R")} ${colors.logoGreen("E")} ${colors.logoYellow(
@@ -349,6 +350,9 @@ export async function run(argv: string[] = process.argv.slice(2)) {
         migrationId: flags.migration,
         projectDir: input[1],
       });
+      if (!flags.dry) {
+        checkGitStatus(projectDir, { force: flags.force });
+      }
       await commands.migrate.run({ migrationId, projectDir, flags });
       break;
     }