tridactyl/hooks/post-merge

#!/usr/bin/env bash

# stolen from https://gist.github.com/sindresorhus/7996717

echo "Running post-merge hook..."

changed_files="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"


file_changed() {
	echo "$changed_files" | grep --quiet "$1"
}

if file_changed package.json; then
	yarn install
fi
build: Fix hook for non-arch users 2017-11-24 11:12:42 +00:00			`#!/usr/bin/env bash`
Fix #101 - run npm install after pull 2017-11-21 20:31:30 +00:00
			`# stolen from https://gist.github.com/sindresorhus/7996717`

Update git hooks Add check to pre-commit hook to skip on Windows, where it is currently partially broken Notify user when hooks are run to replace similar shared-git-hooks functionality 2020-11-26 22:22:08 +01:00			`echo "Running post-merge hook..."`

Fix #101 - run npm install after pull 2017-11-21 20:31:30 +00:00			`changed_files="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"`


build: Check package-lock.json in post-merge, too 2017-11-22 23:06:42 +00:00			`file_changed() {`
			`echo "$changed_files" \| grep --quiet "$1"`
Fix #101 - run npm install after pull 2017-11-21 20:31:30 +00:00			`}`

Only run npm install when we really need to 2018-05-21 13:44:21 +01:00			`if file_changed package.json; then`
s/npm/yarn 2019-05-31 16:48:53 +01:00			`yarn install`
build: Check package-lock.json in post-merge, too 2017-11-22 23:06:42 +00:00			`fi`