Fix version command not committing when commit config option is set (#…

…437)

* Fix version command not committing when commit config option is set

* Update packages/cli/src/commands/version/version.test.ts

Co-authored-by: Mitchell Hamilton <mitchell@hamil.town>

.changeset/silent-planes-smoke.md

@@ -0,0 +1,5 @@
+---
+"@changesets/cli": patch
+---
+
+Fix version command not committing when commit config option is set

packages/cli/src/commands/version/index.ts

@@ -26,6 +26,11 @@ export default async function version(
   },
   config: Config
 ) {
+  const releaseConfig = {
+    ...config,
+    // Disable committing when in snapshot mode
+    commit: options.snapshot ? false : config.commit
+  };
   const [changesets, preState] = await Promise.all([
     readChangesets(cwd),
     readPreState(cwd),
@@ -61,22 +66,19 @@ export default async function version(
   let releasePlan = assembleReleasePlan(
     changesets,
     packages,
-    config,
+    releaseConfig,
     preState,
     options.snapshot
   );
 
   await applyReleasePlan(
     releasePlan,
     packages,
-    {
-      ...config,
-      commit: false
-    },
+    releaseConfig,
     options.snapshot
   );
 
-  if (options.snapshot !== undefined && config.commit) {
+  if (releaseConfig.commit) {
     log("All files have been updated and committed. You're ready to publish!");
   } else {
     log("All files have been updated. Review them and commit at your leisure");

packages/cli/src/commands/version/version.test.ts

@@ -194,6 +194,41 @@ describe("running version in a simple project", () => {
     );
   });
 
+  it("should not commit the result if commit config is not set", async () => {
+    await writeChangesets([simpleChangeset2], cwd);
+    const spy = jest.spyOn(git, "commit");
+
+    expect(spy).not.toHaveBeenCalled();
+
+    await versionCommand(cwd, defaultOptions, modifiedDefaultConfig);
+
+    expect(spy).not.toHaveBeenCalled();
+  });
+
+  it("should commit the result if commit config is set", async () => {
+    await writeChangesets([simpleChangeset2], cwd);
+    const spy = jest.spyOn(git, "commit");
+
+    expect(spy).not.toHaveBeenCalled();
+
+    await versionCommand(cwd, defaultOptions, {
+      ...modifiedDefaultConfig,
+      commit: true
+    });
+
+    expect(spy).toHaveBeenCalled();
+    expect(spy.mock.calls[0][0]).toMatchInlineSnapshot(`
+      "RELEASING: Releasing 2 package(s)
+
+      Releases:
+        pkg-a@1.1.0
+        pkg-b@1.0.1
+
+      [skip ci]
+      "
+    `);
+  });
+
   describe("when there are multiple changeset commits", () => {
     it("should bump releasedPackages", async () => {
       await writeChangesets([simpleChangeset, simpleChangeset2], cwd);
@@ -351,6 +386,27 @@ describe("snapshot release", () => {
     );
   });
 
+  it("should not commit the result even if commit config is set", async () => {
+    let cwd = f.copy("simple-project");
+    await writeChangesets([simpleChangeset2], cwd);
+    const spy = jest.spyOn(git, "commit");
+
+    expect(spy).not.toHaveBeenCalled();
+
+    await versionCommand(
+      cwd,
+      {
+        snapshot: "exprimental"
+      },
+      {
+        ...modifiedDefaultConfig,
+        commit: true
+      }
+    );
+
+    expect(spy).not.toHaveBeenCalled();
+  });
+
   describe("useCalculatedVersionForSnapshots: true", () => {
     it("should update packages using calculated version", async () => {
       let cwd = f.copy("simple-project");