release-it 19.2.0 → 19.2.2

package/lib/plugin/GitBase.js

@@ -32,16 +32,26 @@ class GitBase extends Plugin {
     return latestTag ? latestTag.replace(prefix, '').replace(/^v/, '') : null;
   }
 
+  async getCommitsSinceLatestTag(commitsPath = '') {
+    const latestTagName = await this.getLatestTagName();
+    const ref = latestTagName ? `${latestTagName}..HEAD` : 'HEAD';
+    return this.exec(`git rev-list ${ref} --count ${commitsPath ? `-- ${commitsPath}` : ''}`, { options }).then(Number);
+  }
+
   async getChangelog() {
     const { snapshot } = this.config.getContext();
     const { latestTag, secondLatestTag } = this.config.getContext();
     const context = { latestTag, from: latestTag, to: 'HEAD' };
-    const { changelog } = this.options;
+    const { changelog, commit } = this.options;
     if (!changelog) return null;
 
     if (latestTag && !this.config.isIncrement) {
-      context.from = secondLatestTag;
-      context.to = `${latestTag}^1`;
+      if ((await this.getCommitsSinceLatestTag()) === 0) {
+        context.from = secondLatestTag;
+        context.to = `${latestTag}^1`;
+      } else if (commit === false) {
+        context.to = 'HEAD^1';
+      }
     }
 
     // For now, snapshots do not get a changelog, as it often goes haywire (easy to add to release manually)

package/lib/plugin/git/Git.js

@@ -130,12 +130,6 @@ class Git extends GitBase {
     );
   }
 
-  async getCommitsSinceLatestTag(commitsPath = '') {
-    const latestTagName = await this.getLatestTagName();
-    const ref = latestTagName ? `${latestTagName}..HEAD` : 'HEAD';
-    return this.exec(`git rev-list ${ref} --count ${commitsPath ? `-- ${commitsPath}` : ''}`, { options }).then(Number);
-  }
-
   async getUpstreamArgs(pushRepo) {
     if (pushRepo && !this.isRemoteName(pushRepo)) {
       // Use (only) `pushRepo` if it's configured and looks like a url

package/lib/plugin/git/prompts.js

@@ -1,9 +1,12 @@
-import { format, truncateLines } from '../../util.js';
+import { format, truncateLines, fixArgs } from '../../util.js';
 
 export default {
   commit: {
     type: 'confirm',
-    message: context => `Commit (${truncateLines(format(context.git.commitMessage, context), 1, ' [...]')})?`,
+    message: context => {
+      if (fixArgs(context.git.commitArgs).includes('--amend')) return 'Amend commit?';
+      return `Commit (${truncateLines(format(context.git.commitMessage, context), 1, ' [...]')})?`;
+    },
     default: true
   },
   tag: {

package/lib/util.js

@@ -63,7 +63,8 @@ export const getSystemInfo = () => {
 };
 
 export const format = (template = '', context = {}) => {
-  if (!context || context === null || !template || template === null || template.indexOf('${') === -1) return template;
+  if (!template || typeof template !== 'string') return '';
+  if (!context || context === null || template.indexOf('${') === -1) return template;
   const log = new Log();
   try {
     return eta.renderString(template, context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "19.2.0",
+  "version": "19.2.2",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",