From a87c38f0e2611dc44ef1e73d4df66adbfd5d68a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 10:13:26 +1000 Subject: [PATCH 1/3] chore(no-release): bump standard from 16.0.4 to 17.0.0 (#52) Bumps [standard](https://github.com/standard/standard) from 16.0.4 to 17.0.0. - [Release notes](https://github.com/standard/standard/releases) - [Changelog](https://github.com/standard/standard/blob/master/CHANGELOG.md) - [Commits](https://github.com/standard/standard/compare/v16.0.4...v17.0.0) --- updated-dependencies: - dependency-name: standard dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 43a409e..da3f8f7 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "preferGlobal": true, "devDependencies": { - "standard": "^16.0.4" + "standard": "^17.0.0" }, "release": { "branches": [ From 660a71ff39d53065c118b5262b1025daadb9641d Mon Sep 17 00:00:00 2001 From: Bryan English Date: Thu, 5 May 2022 11:57:10 -0400 Subject: [PATCH 2/3] fix: restore label filtering (#50) --- branch-diff.js | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/branch-diff.js b/branch-diff.js index 1a6cad0..c96c727 100755 --- a/branch-diff.js +++ b/branch-diff.js @@ -12,6 +12,7 @@ import pkgtoId from 'pkg-to-id' import minimist from 'minimist' import { isReleaseCommit } from 'changelog-maker/groups' import { processCommits } from 'changelog-maker/process-commits' +import { collectCommitLabels } from 'changelog-maker/collect-commit-labels' import gitexec from 'gitexec' const pipeline = promisify(_pipeline) @@ -74,6 +75,8 @@ async function diffCollected (options, branchCommits) { let list = branchCommits[1].filter((commit) => !isInList(commit)) + await collectCommitLabels(list) + if (options.excludeLabels.length > 0) { list = list.filter((commit) => { return !commit.labels || !commit.labels.some((label) => { diff --git a/package.json b/package.json index da3f8f7..f0f84c2 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "author": "Rod (http://r.va.gg/)", "license": "MIT", "dependencies": { - "changelog-maker": "^3.0.0", + "changelog-maker": "^3.1.0", "commit-stream": "^1.1.0", "gitexec": "^2.0.1", "minimist": "^1.2.5", From 56112eabadd9c35c7c95bf6b0acfcd2ade1277b3 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 5 May 2022 15:59:07 +0000 Subject: [PATCH 3/3] chore(release): 2.0.4 [skip ci] ### [2.0.4](https://github.com/rvagg/branch-diff/compare/v2.0.3...v2.0.4) (2022-05-05) ### Bug Fixes * restore label filtering ([#50](https://github.com/rvagg/branch-diff/issues/50)) ([660a71f](https://github.com/rvagg/branch-diff/commit/660a71ff39d53065c118b5262b1025daadb9641d)) ### Trivial Changes * **no-release:** bump standard from 16.0.4 to 17.0.0 ([#52](https://github.com/rvagg/branch-diff/issues/52)) ([a87c38f](https://github.com/rvagg/branch-diff/commit/a87c38f0e2611dc44ef1e73d4df66adbfd5d68a8)) --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 169cc49..927b95f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +### [2.0.4](https://github.com/rvagg/branch-diff/compare/v2.0.3...v2.0.4) (2022-05-05) + + +### Bug Fixes + +* restore label filtering ([#50](https://github.com/rvagg/branch-diff/issues/50)) ([660a71f](https://github.com/rvagg/branch-diff/commit/660a71ff39d53065c118b5262b1025daadb9641d)) + + +### Trivial Changes + +* **no-release:** bump standard from 16.0.4 to 17.0.0 ([#52](https://github.com/rvagg/branch-diff/issues/52)) ([a87c38f](https://github.com/rvagg/branch-diff/commit/a87c38f0e2611dc44ef1e73d4df66adbfd5d68a8)) + ### [2.0.3](https://github.com/rvagg/branch-diff/compare/v2.0.2...v2.0.3) (2022-03-02) diff --git a/package.json b/package.json index f0f84c2..6a1df10 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "branch-diff", - "version": "2.0.3", + "version": "2.0.4", "description": "A tool to list print the commits on one git branch that are not on another using loose comparison", "main": "branch-diff.js", "type": "module",