fix(collect-updates): Do not skip change detection when --since pro…

…vided Fixes #1927
lerna · Feb 14, 2019 · 6ff53d6 · 6ff53d6
1 parent e2cc514
commit 6ff53d6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/utils/collect-updates/__tests__/collect-updates.test.js b/utils/collect-updates/__tests__/collect-updates.test.js
@@ -257,6 +257,29 @@ describe("collectUpdates()", () => {
     expect(makeDiffPredicate).toHaveBeenLastCalledWith("beefcafe", execOpts, undefined);
   });
 
+  it("does not exit early on tagged release when --since <ref> is passed", () => {
+    changedPackages.add("package-dag-1");
+
+    describeRef.sync.mockReturnValueOnce({
+      refCount: "0",
+    });
+
+    const graph = buildGraph();
+    const pkgs = graph.rawPackageList;
+    const execOpts = { cwd: "/test" };
+
+    const updates = collectUpdates(pkgs, graph, execOpts, {
+      since: "deadbeef",
+    });
+
+    expect(updates).toEqual([
+      expect.objectContaining({ name: "package-dag-1" }),
+      expect.objectContaining({ name: "package-dag-2a" }),
+      expect.objectContaining({ name: "package-dag-2b" }),
+      expect.objectContaining({ name: "package-dag-3" }),
+    ]);
+  });
+
   it("ignores changes matched by --ignore-changes", () => {
     const graph = buildGraph();
     const pkgs = graph.rawPackageList;

diff --git a/utils/collect-updates/collect-updates.js b/utils/collect-updates/collect-updates.js
@@ -24,7 +24,7 @@ function collectUpdates(filteredPackages, packageGraph, execOpts, commandOptions
     const { sha, refCount, lastTagName } = describeRef.sync(execOpts, commandOptions.includeMergedTags);
     // TODO: warn about dirty tree?
 
-    if (refCount === "0" && forced.size === 0) {
+    if (refCount === "0" && forced.size === 0 && !committish) {
       // no commits since previous release
       log.notice("", "Current HEAD is already released, skipping change detection.");