Fixes #2633: Make git hook symlinks relative. #2651
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
grasmash
reviewed
Mar 16, 2018
| @@ -217,15 +217,16 @@ public function gitHooks() { | |||
| protected function installGitHook($hook) { | |||
| if ($this->getConfigValue('git.hooks.' . $hook)) { | |||
| $this->say("Installing $hook git hook..."); | |||
| $source = $this->getConfigValue('git.hooks.' . $hook) . "/$hook"; | |||
| $dest = $this->getConfigValue('repo.root') . "/.git/hooks/$hook"; | |||
| $bltHook = $this->getConfigValue('git.hooks.' . $hook) . "/$hook"; | |||
There was a problem hiding this comment.
This isn't necessarily a BLT hook, it could be custom. Why not name it something like $hook_source?
There was a problem hiding this comment.
hmm, it's a BLT hook in the sense that it's the hook that ships with BLT in it's vendor directory:
hooks:
pre-commit: ${blt.root}/scripts/git-hooks
commit-msg: ${blt.root}/scripts/git-hooks
There was a problem hiding this comment.
I can change it to $hook_source if you prefer, was thinking it was essentially a "blt provided hook"
grasmash
reviewed
Mar 16, 2018
| $source = $this->getConfigValue('git.hooks.' . $hook) . "/$hook"; | ||
| $dest = $this->getConfigValue('repo.root') . "/.git/hooks/$hook"; | ||
| $bltHook = $this->getConfigValue('git.hooks.' . $hook) . "/$hook"; | ||
| $projectHookDirectory = $this->getConfigValue('repo.root') . "/.git/hooks"; |
There was a problem hiding this comment.
Non-class property variables should be snake case.
|
Be sure to add test that asserts the symlink location is valid. |
208e2d8 to
961b23b
Compare
grasmash
reviewed
Mar 16, 2018
| $this->assertFileExists($this->sandboxInstance . '/.git/hooks/commit-msg'); | ||
| $this->assertFileExists($this->sandboxInstance . '/.git/hooks/pre-commit'); | ||
| $hooks_path = $this->sandboxInstance . '/.git/hooks'; | ||
| $hook_names = [ |
There was a problem hiding this comment.
You can load this list from $this->config.
961b23b to
1408c81
Compare
1408c81 to
22ea59b
Compare
22ea59b to
e35a750
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.