release-it 15.1.0-next.0 → 15.1.0

package/lib/plugin/git/Git.js

@@ -168,7 +168,8 @@ class Git extends GitBase {
 
   commit({ message = this.options.commitMessage, args = this.options.commitArgs } = {}) {
     const msg = format(message, this.config.getContext());
-    return this.exec(['git', 'commit', '--message', msg, ...fixArgs(args)]).then(
+    const commitMessageArgs = msg ? ['--message', msg] : [];
+    return this.exec(['git', 'commit', ...commitMessageArgs, ...fixArgs(args)]).then(
       () => this.setContext({ isCommitted: true }),
       err => {
         this.debug(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "15.1.0-next.0",
+  "version": "15.1.0",
   "description": "Generic CLI tool to automate versioning and package publishing related tasks.",
   "keywords": [
     "build",
@@ -66,9 +66,9 @@
     "execa": "6.1.0",
     "form-data": "4.0.0",
     "git-url-parse": "11.6.0",
-    "globby": "13.1.1",
-    "got": "12.0.4",
-    "inquirer": "8.2.4",
+    "globby": "13.1.2",
+    "got": "12.1.0",
+    "inquirer": "9.0.0",
     "is-ci": "3.0.1",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
@@ -87,18 +87,18 @@
   },
   "devDependencies": {
     "@octokit/request-error": "2.1.0",
-    "ava": "4.2.0",
-    "eslint": "8.14.0",
+    "ava": "4.3.0",
+    "eslint": "8.18.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-ava": "13.2.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-prettier": "4.0.0",
     "mock-fs": "5.1.2",
     "mock-stdio": "1.0.3",
-    "nock": "13.2.4",
+    "nock": "13.2.7",
     "nyc": "15.1.0",
-    "prettier": "2.6.2",
-    "sinon": "13.0.2",
+    "prettier": "2.7.1",
+    "sinon": "14.0.0",
     "strip-ansi": "7.0.1"
   },
   "engines": {

package/test/git.js

@@ -140,6 +140,20 @@ test.serial('should commit, tag and push with extra args', async t => {
   stub.restore();
 });
 
+test.serial('should amend commit without message if not provided', async t => {
+  const bare = mkTmpDir();
+  sh.exec(`git init --bare ${bare}`);
+  sh.exec(`git clone ${bare} .`);
+  gitAdd('line', 'file', 'Add file');
+  const options = { git: { commitArgs: ['--amend', '--no-edit', '--no-verify'] } };
+  const gitClient = factory(Git, { options });
+  const stub = sinon.stub(gitClient.shell, 'exec').resolves();
+  await gitClient.stage('package.json');
+  await gitClient.commit();
+  t.deepEqual(stub.secondCall.args[0], ['git', 'commit', '--amend', '--no-edit', '--no-verify']);
+  stub.restore();
+});
+
 test.serial('should commit and tag with quoted characters', async t => {
   const bare = mkTmpDir();
   sh.exec(`git init --bare ${bare}`);

package/test/github.js

@@ -198,7 +198,8 @@ test('should create new release for unreleased tag', async t => {
 });
 
 test('should release to enterprise host', async t => {
-  const github = factory(GitHub, { options: { git, github: { tokenRef } } });
+  const options = { git, github: { tokenRef, pushRepo: 'git://github.example.org:user/repo' } };
+  const github = factory(GitHub, { options });
   const exec = sinon.stub(github.shell, 'exec').callThrough();
   exec.withArgs('git remote get-url origin').resolves(`https://github.example.org/user/repo`);
   exec.withArgs('git config --get remote.origin.url').resolves(`https://github.example.org/user/repo`);