Skip to content

Commit

Permalink
1.0.4: Fix skipping rebase step
Browse files Browse the repository at this point in the history
Signed-off-by: Valentin Kiselev <mrexox@evilmartians.com>
  • Loading branch information
mrexox committed Jun 27, 2022
1 parent 34cee8b commit c89d3de
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 19 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## master (unreleased)

# 1.0.4 (2022-06-27)

- Support skipping on rebase ([PR #289](https://github.com/evilmartians/lefthook/pull/289) by @mrexox)

# 1.0.3 (2022-06-25)
Expand Down
2 changes: 1 addition & 1 deletion internal/config/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ func mergeCommands(base, extra *viper.Viper) (map[string]*Command, error) {
}

for key, replace := range runReplaces {
// Deprecated, will be deleted
if replace.Run != "" {
commands[key].Run = strings.Replace(commands[key].Run, CMD, replace.Run, -1)
}

// Deprecated, will be deleted
if replace.Runner != "" {
commands[key].Runner = strings.Replace(commands[key].Runner, CMD, replace.Runner, -1)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
)

const Version = "1.0.3"
const Version = "1.0.4"

var (
versionRegexp = regexp.MustCompile(
Expand Down
2 changes: 1 addition & 1 deletion packaging/npm-bundled/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@evilmartians/lefthook",
"version": "1.0.3",
"version": "1.0.4",
"description": "Simple git hooks manager",
"main": "index.js",
"bin": {
Expand Down
2 changes: 1 addition & 1 deletion packaging/npm-installer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@evilmartians/lefthook-installer",
"version": "1.0.3",
"version": "1.0.4",
"description": "Simple git hooks manager",
"main": "index.js",
"bin": {
Expand Down
2 changes: 1 addition & 1 deletion packaging/npm/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# NPM package version to release
VERSION := 1.0.3
VERSION := 1.0.4

DIST_DIR := ../../dist

Expand Down
2 changes: 1 addition & 1 deletion packaging/npm/lefthook-darwin-arm64/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lefthook-darwin-arm64",
"version": "1.0.3",
"version": "1.0.4",
"description": "The macOS ARM 64-bit binary for lefthook, git hooks manager.",
"preferUnplugged": false,
"repository": "https://github.com/evilmartians/lefthook",
Expand Down
2 changes: 1 addition & 1 deletion packaging/npm/lefthook-darwin-x64/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lefthook-darwin-x64",
"version": "1.0.3",
"version": "1.0.4",
"description": "The macOS 64-bit binary for lefthook, git hooks manager.",
"preferUnplugged": false,
"repository": "https://github.com/evilmartians/lefthook",
Expand Down
2 changes: 1 addition & 1 deletion packaging/npm/lefthook-linux-arm64/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lefthook-linux-arm64",
"version": "1.0.3",
"version": "1.0.4",
"description": "The Linux ARM 64-bit binary for lefthook, git hooks manager.",
"preferUnplugged": false,
"repository": "https://github.com/evilmartians/lefthook",
Expand Down
2 changes: 1 addition & 1 deletion packaging/npm/lefthook-linux-x64/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lefthook-linux-x64",
"version": "1.0.3",
"version": "1.0.4",
"description": "The Linux 64-bit binary for lefthook, git hooks manager.",
"preferUnplugged": false,
"repository": "https://github.com/evilmartians/lefthook",
Expand Down
2 changes: 1 addition & 1 deletion packaging/npm/lefthook-windows-arm64/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lefthook-windows-arm64",
"version": "1.0.3",
"version": "1.0.4",
"description": "The Windows ARM 64-bit binary for lefthook, git hooks manager.",
"preferUnplugged": false,
"repository": "https://github.com/evilmartians/lefthook",
Expand Down
2 changes: 1 addition & 1 deletion packaging/npm/lefthook-windows-x64/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lefthook-windows-x64",
"version": "1.0.3",
"version": "1.0.4",
"description": "The Windows 64-bit binary for lefthook, git hooks manager.",
"preferUnplugged": false,
"repository": "https://github.com/evilmartians/lefthook",
Expand Down
14 changes: 7 additions & 7 deletions packaging/npm/lefthook/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lefthook",
"version": "1.0.3",
"version": "1.0.4",
"description": "Simple git hooks manager",
"main": "index.js",
"repository": "https://github.com/evilmartians/lefthook",
Expand All @@ -20,11 +20,11 @@
},
"homepage": "https://github.com/evilmartians/lefthook#readme",
"optionalDependencies": {
"lefthook-darwin-arm64": "1.0.3",
"lefthook-darwin-x64": "1.0.3",
"lefthook-linux-arm64": "1.0.3",
"lefthook-linux-x64": "1.0.3",
"lefthook-windows-arm64": "1.0.3",
"lefthook-windows-x64": "1.0.3"
"lefthook-darwin-arm64": "1.0.4",
"lefthook-darwin-x64": "1.0.4",
"lefthook-linux-arm64": "1.0.4",
"lefthook-linux-x64": "1.0.4",
"lefthook-windows-arm64": "1.0.4",
"lefthook-windows-x64": "1.0.4"
}
}
2 changes: 1 addition & 1 deletion packaging/rubygems/lefthook.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Gem::Specification.new do |spec|
spec.name = "lefthook"
spec.version = "1.0.3"
spec.version = "1.0.4"
spec.authors = ["A.A.Abroskin", "Evil Martians"]
spec.email = ["lefthook@evilmartians.com"]

Expand Down

0 comments on commit c89d3de

Please sign in to comment.