From 470f6e4a1b6cf51fcd3929c76250f239c7fecefe Mon Sep 17 00:00:00 2001
From: Milo Fultz <mfultz@atlassian.com>
Date: Wed, 12 Feb 2025 10:33:59 -0800
Subject: [PATCH 1/3] Add no-commit flag

---
 .../cli/src/commands/add/__tests__/add.ts     | 32 +++++++++++++++++++
 packages/cli/src/commands/add/index.ts        |  4 +--
 packages/cli/src/index.ts                     |  5 +--
 packages/cli/src/run.ts                       |  4 +--
 packages/cli/src/types.ts                     |  1 +
 5 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/commands/add/__tests__/add.ts b/packages/cli/src/commands/add/__tests__/add.ts
index 1664ae3ce..0782359df 100644
--- a/packages/cli/src/commands/add/__tests__/add.ts
+++ b/packages/cli/src/commands/add/__tests__/add.ts
@@ -236,6 +236,38 @@ describe("Add command", () => {
     expect(git.commit).toHaveBeenCalledTimes(1);
   });
 
+  it("should not commit when the `no-commit` flag is passed in", async () => {
+    const cwd = await testdir({
+      "package.json": JSON.stringify({
+        private: true,
+        workspaces: ["packages/*"],
+      }),
+      "packages/pkg-a/package.json": JSON.stringify({
+        name: "pkg-a",
+        version: "1.0.0",
+        dependencies: {
+          "pkg-b": "1.0.0",
+        },
+      }),
+      "packages/pkg-b/package.json": JSON.stringify({
+        name: "pkg-b",
+        version: "1.0.0",
+      }),
+    });
+
+    mockUserResponses({ releases: { "pkg-a": "patch" } });
+    await addChangeset(
+      cwd,
+      { empty: false, noCommit: true },
+      {
+        ...defaultConfig,
+        commit: [path.resolve(__dirname, "..", "..", "..", "commit"), null],
+      }
+    );
+    expect(git.add).toHaveBeenCalledTimes(0);
+    expect(git.commit).toHaveBeenCalledTimes(0);
+  });
+
   it("should create empty changeset when empty flag is passed in", async () => {
     const cwd = await testdir({
       "package.json": JSON.stringify({
diff --git a/packages/cli/src/commands/add/index.ts b/packages/cli/src/commands/add/index.ts
index 3e3a59318..c6424606a 100644
--- a/packages/cli/src/commands/add/index.ts
+++ b/packages/cli/src/commands/add/index.ts
@@ -18,7 +18,7 @@ import printConfirmationMessage from "./messages";
 
 export default async function add(
   cwd: string,
-  { empty, open }: { empty?: boolean; open?: boolean },
+  { empty, open, noCommit }: { empty?: boolean; open?: boolean; noCommit?: boolean },
   config: Config
 ): Promise<void> {
   const packages = await getPackages(cwd);
@@ -90,7 +90,7 @@ export default async function add(
       config.commit,
       cwd
     );
-    if (getAddMessage) {
+    if (getAddMessage && !noCommit) {
       await git.add(path.resolve(changesetBase, `${changesetID}.md`), cwd);
       await git.commit(await getAddMessage(newChangeset, commitOpts), cwd);
       log(pc.green(`${empty ? "Empty " : ""}Changeset added and committed`));
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index de627c493..da837d98d 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -7,7 +7,7 @@ import { run } from "./run";
 const args = process.argv.slice(2);
 
 const parsed = mri(args, {
-  boolean: ["sinceMaster", "verbose", "empty", "open", "gitTag", "snapshot"],
+  boolean: ["sinceMaster", "verbose", "empty", "open", "gitTag", "snapshot", "noCommit"],
   string: [
     "output",
     "otp",
@@ -21,6 +21,7 @@ const parsed = mri(args, {
     // Short flags
     v: "verbose",
     o: "output",
+    n: "noCommit",
     // Support kebab-case flags
     "since-master": "sinceMaster",
     "git-tag": "gitTag",
@@ -52,7 +53,7 @@ if (parsed.help && args.length === 1) {
     $ changeset [command]
   Commands
     init
-    add [--empty] [--open]
+    add [--empty] [--open] [--no-commit]
     version [--ignore] [--snapshot <?name>] [--snapshot-prerelease-template <template>]
     publish [--tag <name>] [--otp <code>] [--no-git-tag]
     status [--since <branch>] [--verbose] [--output JSON_FILE.json]
diff --git a/packages/cli/src/run.ts b/packages/cli/src/run.ts
index 3034cd30a..bb56c3c61 100644
--- a/packages/cli/src/run.ts
+++ b/packages/cli/src/run.ts
@@ -64,9 +64,9 @@ export async function run(
   }
 
   if (input.length < 1) {
-    const { empty, open }: CliOptions = flags;
+    const { empty, noCommit, open }: CliOptions = flags;
     // @ts-ignore if this is undefined, we have already exited
-    await add(cwd, { empty, open }, config);
+    await add(cwd, { empty, noCommit, open }, config);
   } else if (input[0] !== "pre" && input.length > 1) {
     error(
       "Too many arguments passed to changesets - we only accept the command name as an argument"
diff --git a/packages/cli/src/types.ts b/packages/cli/src/types.ts
index 9f3262743..1c3faa047 100644
--- a/packages/cli/src/types.ts
+++ b/packages/cli/src/types.ts
@@ -12,6 +12,7 @@ export type CliOptions = {
   tag?: string;
   gitTag?: boolean;
   open?: boolean;
+  noCommit?: boolean;
 };
 
 export type CommandOptions = CliOptions & {

From 0ac87f409b68549724733b6ff6816514b87a3ab5 Mon Sep 17 00:00:00 2001
From: Milo Fultz <mfultz@atlassian.com>
Date: Wed, 12 Feb 2025 10:47:10 -0800
Subject: [PATCH 2/3] Add changeset

---
 .changeset/vast-onions-behave.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/vast-onions-behave.md

diff --git a/.changeset/vast-onions-behave.md b/.changeset/vast-onions-behave.md
new file mode 100644
index 000000000..62bc8806c
--- /dev/null
+++ b/.changeset/vast-onions-behave.md
@@ -0,0 +1,5 @@
+---
+"@changesets/cli": minor
+---
+
+Add no commit option to "add"/default command. Use `--no-commit` or `-n` when instantiated and the changeset will not be committed.

From d18f24848cec2213706973306f1fc4f39b3a76ce Mon Sep 17 00:00:00 2001
From: Milo Fultz <mfultz@atlassian.com>
Date: Wed, 12 Feb 2025 10:50:15 -0800
Subject: [PATCH 3/3] Formatting fixes

---
 packages/cli/src/commands/add/index.ts |  6 +++++-
 packages/cli/src/index.ts              | 10 +++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/commands/add/index.ts b/packages/cli/src/commands/add/index.ts
index c6424606a..e49c6f477 100644
--- a/packages/cli/src/commands/add/index.ts
+++ b/packages/cli/src/commands/add/index.ts
@@ -18,7 +18,11 @@ import printConfirmationMessage from "./messages";
 
 export default async function add(
   cwd: string,
-  { empty, open, noCommit }: { empty?: boolean; open?: boolean; noCommit?: boolean },
+  {
+    empty,
+    open,
+    noCommit,
+  }: { empty?: boolean; open?: boolean; noCommit?: boolean },
   config: Config
 ): Promise<void> {
   const packages = await getPackages(cwd);
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index da837d98d..e5d6e036d 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -7,7 +7,15 @@ import { run } from "./run";
 const args = process.argv.slice(2);
 
 const parsed = mri(args, {
-  boolean: ["sinceMaster", "verbose", "empty", "open", "gitTag", "snapshot", "noCommit"],
+  boolean: [
+    "sinceMaster",
+    "verbose",
+    "empty",
+    "open",
+    "gitTag",
+    "snapshot",
+    "noCommit",
+  ],
   string: [
     "output",
     "otp",