From 5f50cb31a4e1986d694d7f329afd4f3f66415402 Mon Sep 17 00:00:00 2001 From: "Shahar Or (mightyiam)" <mightyiampresence@gmail.com> Date: Thu, 19 Oct 2017 22:53:08 +0300 Subject: [PATCH 1/2] fix: commit with --no-verify (fixes #75) --- lib/update-lockfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/update-lockfile.js b/lib/update-lockfile.js index 052d94d7..188711c1 100644 --- a/lib/update-lockfile.js +++ b/lib/update-lockfile.js @@ -61,7 +61,7 @@ module.exports.commitLockfiles = function commitLockfiles () { exec(`git config user.name "${commitName}"`) if (shouldAmend) { - exec(`git commit --amend --author="${commitName} <${commitEmail}>" --no-edit`) + exec(`git commit --no-verify --amend --author="${commitName} <${commitEmail}>" --no-edit`) } else { let lockfileWording // either say "lockfile" or "lockfiles" depending on how many files are changed @@ -71,6 +71,6 @@ module.exports.commitLockfiles = function commitLockfiles () { lockfileWording = 'lockfile' } const updateMessage = `chore(package): update ${lockfileWording}\n\nhttps://npm.im/greenkeeper-lockfile` - exec(`git commit -m "${updateMessage}"`) + exec(`git commit --no-verify -m "${updateMessage}"`) } } From 45cf5e63be41dfa24f37c4cd3bc2534fbf94b945 Mon Sep 17 00:00:00 2001 From: "Shahar Or (mightyiam)" <mightyiampresence@gmail.com> Date: Thu, 13 Sep 2018 22:25:04 +0700 Subject: [PATCH 2/2] fix: tests expect --no-verify commits --- test/__snapshots__/update.js.snap | 14 ++++----- .../lib/__snapshots__/update-lockfile.js.snap | 30 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/test/__snapshots__/update.js.snap b/test/__snapshots__/update.js.snap index a0b007b1..904dd310 100644 --- a/test/__snapshots__/update.js.snap +++ b/test/__snapshots__/update.js.snap @@ -32,7 +32,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -65,7 +65,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -98,7 +98,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -131,7 +131,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -171,7 +171,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -211,7 +211,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -239,7 +239,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] diff --git a/test/lib/__snapshots__/update-lockfile.js.snap b/test/lib/__snapshots__/update-lockfile.js.snap index 45104a23..c4745425 100644 --- a/test/lib/__snapshots__/update-lockfile.js.snap +++ b/test/lib/__snapshots__/update-lockfile.js.snap @@ -12,7 +12,7 @@ Array [ "git config user.email \\"testbot@test.de\\"", "git config user.name \\"testbot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -30,7 +30,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -47,7 +47,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -63,7 +63,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -78,7 +78,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -96,7 +96,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -114,7 +114,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -132,7 +132,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -148,7 +148,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -164,7 +164,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -180,7 +180,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -195,7 +195,7 @@ Array [ "git add yarn.lock 2>/dev/null || true", "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", - "git commit --amend --author=\\"greenkeeperio-bot <support@greenkeeper.io>\\" --no-edit", + "git commit --no-verify --amend --author=\\"greenkeeperio-bot <support@greenkeeper.io>\\" --no-edit", ] `; @@ -208,7 +208,7 @@ Array [ "git add yarn.lock 2>/dev/null || true", "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"Example Person\\"", - "git commit --amend --author=\\"Example Person <support@greenkeeper.io>\\" --no-edit", + "git commit --no-verify --amend --author=\\"Example Person <support@greenkeeper.io>\\" --no-edit", ] `; @@ -222,7 +222,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ] @@ -238,7 +238,7 @@ Array [ "git config user.email \\"support@greenkeeper.io\\"", "git config user.name \\"greenkeeperio-bot\\"", "git status --porcelain", - "git commit -m \\"chore(package): update lockfile + "git commit --no-verify -m \\"chore(package): update lockfile https://npm.im/greenkeeper-lockfile\\"", ]