Skip to content

Commit 342c147

Browse files
authored
Merge pull request #25 from fastify/issue-16
Update LICENSE and Readme
2 parents eface46 + a7cf0ad commit 342c147

4 files changed

Lines changed: 26 additions & 27 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ jobs:
5353
needs: build
5454
runs-on: ubuntu-latest
5555
steps:
56-
<<<<<<< HEAD
57-
- uses: fastify/github-action-merge-dependabot@v2.2.0
58-
=======
5956
- uses: fastify/github-action-merge-dependabot@v2.1.1
60-
>>>>>>> 5e5da89adac942de074e909b4b65a8fcb2e53e72
6157
if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request' }}
6258
with:
63-
github-token: ${{secrets.GITHUB_TOKEN}}
59+
github-token: ${{secrets.GITHUB_TOKEN}}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
The MIT License (MIT)
22

33
Copyright (c) 2015 Arnout Kazemier, Martijn Swaagman, the Contributors.
4+
Copyright (c) 2021 Fastify Collaborators
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy
67
of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +20,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1920
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2021
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2122
SOFTWARE.
22-

README.md

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
# pre-commit
1+
# @fastify/pre-commit
22

3-
[![Version npm][version]](http://browsenpm.org/package/pre-commit)[![Build Status][build]](https://travis-ci.org/observing/pre-commit)[![Dependencies][david]](https://david-dm.org/observing/pre-commit)[![Coverage Status][cover]](https://coveralls.io/r/observing/pre-commit?branch=master)
4-
5-
[version]: http://img.shields.io/npm/v/pre-commit.svg?style=flat-square
6-
[build]: http://img.shields.io/travis/observing/pre-commit/master.svg?style=flat-square
7-
[david]: https://img.shields.io/david/observing/pre-commit.svg?style=flat-square
8-
[cover]: http://img.shields.io/coveralls/observing/pre-commit/master.svg?style=flat-square
9-
10-
**pre-commit** is a pre-commit hook installer for `git`. It will ensure that
3+
**@fastify/pre-commit** is a pre-commit hook installer for `git`. It will ensure that
114
your `npm test` (or other specified scripts) passes before you can commit your
125
changes. This all conveniently configured in your `package.json`.
136

@@ -16,12 +9,12 @@ But don't worry, you can still force a commit by telling `git` to skip the
169

1710
### Installation
1811

19-
It's advised to install the **pre-commit** module as a `devDependencies` in your
12+
It's advised to install the **@fastify/pre-commit** module as a `devDependencies` in your
2013
`package.json` as you only need this for development purposes. To install the
2114
module simply run:
2215

2316
```
24-
npm install --save-dev pre-commit
17+
npm install --save-dev @fastify/pre-commit
2518
```
2619

2720
To install it as `devDependency`. When this module is installed it will override
@@ -30,11 +23,11 @@ the existing `pre-commit` file in your `.git/hooks` folder. Existing
3023

3124
### Configuration
3225

33-
`pre-commit` will try to run your `npm test` command in the root of the git
26+
`@fastify/pre-commit` will try to run your `npm test` command in the root of the git
3427
repository by default unless it's the default value that is set by the `npm
3528
init` script.
3629

37-
But `pre-commit` is not limited to just running your `npm test`'s during the
30+
But `@fastify/pre-commit` is not limited to just running your `npm test`'s during the
3831
commit hook. It's also capable of running every other script that you've
3932
specified in your `package.json` "scripts" field. So before people commit you
4033
could ensure that:
@@ -127,7 +120,7 @@ Configuration can also be defined inside a standalone `.pre-commit.json` config
127120
}
128121
```
129122

130-
The contents of `.pre-commit.json` will be used in the place of whatever was defined in the `pre-commit`
123+
The contents of `.pre-commit.json` will be used in the place of whatever was defined in the `pre-commit`
131124
or `precommit` property inside `package.json`.
132125

133126
It's all the same. Different styles so use what matches your project. To learn
@@ -142,3 +135,8 @@ http://githooks.com
142135
### License
143136

144137
MIT
138+
139+
### Attribution
140+
141+
The `@fastify/pre-commit` package is a fork of the original work found at
142+
https://github.com/observing/pre-commit.

package.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "pre-commit",
3-
"version": "1.2.2",
2+
"name": "@fastify/pre-commit",
3+
"version": "2.0.0-pre.1",
44
"description": "Automatically install pre-commit hooks for your npm modules.",
55
"main": "index.js",
66
"scripts": {
@@ -14,7 +14,7 @@
1414
},
1515
"repository": {
1616
"type": "git",
17-
"url": "git://github.com/observing/pre-commit.git"
17+
"url": "git://github.com/fastify/pre-commit.git"
1818
},
1919
"keywords": [
2020
"git",
@@ -26,16 +26,21 @@
2626
"test",
2727
"development"
2828
],
29-
"author": "Arnout Kazemier <opensource@observe.it>",
30-
"homepage": "https://github.com/observing/pre-commit",
29+
"contributors": [
30+
{
31+
"name": "Arnout Kazemier",
32+
"email": "opensource@observe.it",
33+
"originalAuthor": true
34+
}
35+
],
36+
"homepage": "https://github.com/fastify/pre-commit",
3137
"license": "MIT",
3238
"dependencies": {
3339
"cross-spawn": "^7.0.3",
34-
"spawn-sync": "^2.0.0",
3540
"which": "^2.0.2"
3641
},
3742
"devDependencies": {
38-
"pre-commit": "git://github.com/observing/pre-commit.git",
43+
"pre-commit": "git://github.com/fastify/pre-commit.git",
3944
"proxyquire": "^2.1.3",
4045
"standard": "^16.0.3",
4146
"tap": "^15.0.9"

0 commit comments

Comments
 (0)