From 14f712b3aca2b8c57a868ae2c6e2a029c1721203 Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Thu, 13 Jun 2024 10:49:53 +0300 Subject: [PATCH] 1.6.16: do not overwrite the hooks after re-fetching the remotes --- CHANGELOG.md | 5 +++++ docs/install.md | 2 +- internal/version/version.go | 2 +- packaging/Makefile | 2 +- packaging/npm-bundled/package.json | 2 +- packaging/npm-installer/package.json | 2 +- .../npm/lefthook-darwin-arm64/package.json | 2 +- packaging/npm/lefthook-darwin-x64/package.json | 2 +- .../npm/lefthook-freebsd-arm64/package.json | 2 +- .../npm/lefthook-freebsd-x64/package.json | 2 +- .../npm/lefthook-linux-arm64/package.json | 2 +- packaging/npm/lefthook-linux-x64/package.json | 2 +- .../npm/lefthook-windows-arm64/package.json | 2 +- .../npm/lefthook-windows-x64/package.json | 2 +- packaging/npm/lefthook/package.json | 18 +++++++++--------- packaging/rubygems/lefthook.gemspec | 2 +- 16 files changed, 28 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe55ab06..e26997dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## master (unreleased) +## 1.6.16 (2024-06-13) + +- fix: skip overwriting hooks when fetching data from remotes ([#745](https://github.com/evilmartians/lefthook/pull/745)) by @mrexox +- fix: fetch remotes only for non ghost hooks ([#744](https://github.com/evilmartians/lefthook/pull/744)) by @mrexox + ## 1.6.15 (2024-06-03) - feat: add refetch option to remotes config ([#739](https://github.com/evilmartians/lefthook/pull/739)) by @mrexox diff --git a/docs/install.md b/docs/install.md index 377468b8..1147f046 100644 --- a/docs/install.md +++ b/docs/install.md @@ -78,7 +78,7 @@ You can find the Swift wrapper plugin [here](https://github.com/csjones/lefthook Utilize lefthook in your Swift project using Swift Package Manager: ```swift -.package(url: "https://github.com/csjones/lefthook-plugin.git", exact: "1.6.15"), +.package(url: "https://github.com/csjones/lefthook-plugin.git", exact: "1.6.16"), ``` Or, with [mint](https://github.com/yonaskolb/Mint): diff --git a/internal/version/version.go b/internal/version/version.go index 49e2a9f2..5d1dd72a 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -8,7 +8,7 @@ import ( "strconv" ) -const version = "1.6.15" +const version = "1.6.16" var ( // Is set via -X github.com/evilmartians/lefthook/internal/version.commit={commit}. diff --git a/packaging/Makefile b/packaging/Makefile index 313ba125..010167ec 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -1,5 +1,5 @@ # Packages version to release -VERSION := 1.6.15 +VERSION := 1.6.16 DIST_DIR := ../dist diff --git a/packaging/npm-bundled/package.json b/packaging/npm-bundled/package.json index 32d34d04..d189492b 100644 --- a/packaging/npm-bundled/package.json +++ b/packaging/npm-bundled/package.json @@ -1,6 +1,6 @@ { "name": "@evilmartians/lefthook", - "version": "1.6.15", + "version": "1.6.16", "description": "Simple git hooks manager", "main": "index.js", "bin": { diff --git a/packaging/npm-installer/package.json b/packaging/npm-installer/package.json index 01479369..d3ae869b 100644 --- a/packaging/npm-installer/package.json +++ b/packaging/npm-installer/package.json @@ -1,6 +1,6 @@ { "name": "@evilmartians/lefthook-installer", - "version": "1.6.15", + "version": "1.6.16", "description": "Simple git hooks manager", "main": "index.js", "bin": { diff --git a/packaging/npm/lefthook-darwin-arm64/package.json b/packaging/npm/lefthook-darwin-arm64/package.json index 66181d36..8ecec409 100644 --- a/packaging/npm/lefthook-darwin-arm64/package.json +++ b/packaging/npm/lefthook-darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-darwin-arm64", - "version": "1.6.15", + "version": "1.6.16", "description": "The macOS ARM 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-darwin-x64/package.json b/packaging/npm/lefthook-darwin-x64/package.json index 2203e1b5..c4908f17 100644 --- a/packaging/npm/lefthook-darwin-x64/package.json +++ b/packaging/npm/lefthook-darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-darwin-x64", - "version": "1.6.15", + "version": "1.6.16", "description": "The macOS 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-freebsd-arm64/package.json b/packaging/npm/lefthook-freebsd-arm64/package.json index 7b490719..111af8eb 100644 --- a/packaging/npm/lefthook-freebsd-arm64/package.json +++ b/packaging/npm/lefthook-freebsd-arm64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-freebsd-arm64", - "version": "1.6.15", + "version": "1.6.16", "description": "The FreeBSD ARM 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-freebsd-x64/package.json b/packaging/npm/lefthook-freebsd-x64/package.json index 67ef1bc8..b9c8e24d 100644 --- a/packaging/npm/lefthook-freebsd-x64/package.json +++ b/packaging/npm/lefthook-freebsd-x64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-freebsd-x64", - "version": "1.6.15", + "version": "1.6.16", "description": "The FreeBSD 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-linux-arm64/package.json b/packaging/npm/lefthook-linux-arm64/package.json index 3d5fce29..cb176919 100644 --- a/packaging/npm/lefthook-linux-arm64/package.json +++ b/packaging/npm/lefthook-linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-linux-arm64", - "version": "1.6.15", + "version": "1.6.16", "description": "The Linux ARM 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-linux-x64/package.json b/packaging/npm/lefthook-linux-x64/package.json index 2a4af51d..3dd36e9d 100644 --- a/packaging/npm/lefthook-linux-x64/package.json +++ b/packaging/npm/lefthook-linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-linux-x64", - "version": "1.6.15", + "version": "1.6.16", "description": "The Linux 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-windows-arm64/package.json b/packaging/npm/lefthook-windows-arm64/package.json index 1134bda6..0ceef7a4 100644 --- a/packaging/npm/lefthook-windows-arm64/package.json +++ b/packaging/npm/lefthook-windows-arm64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-windows-arm64", - "version": "1.6.15", + "version": "1.6.16", "description": "The Windows ARM 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-windows-x64/package.json b/packaging/npm/lefthook-windows-x64/package.json index 32258ede..ceadcefb 100644 --- a/packaging/npm/lefthook-windows-x64/package.json +++ b/packaging/npm/lefthook-windows-x64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-windows-x64", - "version": "1.6.15", + "version": "1.6.16", "description": "The Windows 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook/package.json b/packaging/npm/lefthook/package.json index 07d5bc71..2f7c4187 100644 --- a/packaging/npm/lefthook/package.json +++ b/packaging/npm/lefthook/package.json @@ -1,6 +1,6 @@ { "name": "lefthook", - "version": "1.6.15", + "version": "1.6.16", "description": "Simple git hooks manager", "main": "index.js", "repository": "https://github.com/evilmartians/lefthook", @@ -20,14 +20,14 @@ }, "homepage": "https://github.com/evilmartians/lefthook#readme", "optionalDependencies": { - "lefthook-darwin-arm64": "1.6.15", - "lefthook-darwin-x64": "1.6.15", - "lefthook-linux-arm64": "1.6.15", - "lefthook-linux-x64": "1.6.15", - "lefthook-freebsd-arm64": "1.6.15", - "lefthook-freebsd-x64": "1.6.15", - "lefthook-windows-arm64": "1.6.15", - "lefthook-windows-x64": "1.6.15" + "lefthook-darwin-arm64": "1.6.16", + "lefthook-darwin-x64": "1.6.16", + "lefthook-linux-arm64": "1.6.16", + "lefthook-linux-x64": "1.6.16", + "lefthook-freebsd-arm64": "1.6.16", + "lefthook-freebsd-x64": "1.6.16", + "lefthook-windows-arm64": "1.6.16", + "lefthook-windows-x64": "1.6.16" }, "scripts": { "postinstall": "node postinstall.js" diff --git a/packaging/rubygems/lefthook.gemspec b/packaging/rubygems/lefthook.gemspec index 0995b0e0..c2fc937a 100644 --- a/packaging/rubygems/lefthook.gemspec +++ b/packaging/rubygems/lefthook.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |spec| spec.name = "lefthook" - spec.version = "1.6.15" + spec.version = "1.6.16" spec.authors = ["A.A.Abroskin", "Evil Martians"] spec.email = ["lefthook@evilmartians.com"]