Make hooks refer to core.hookspath
#5245
Merged
Conversation
This file contains hidden or 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
In some cases, we're echoing the old hook contents, but we're not echoing it into a file, which means we aren't testing what we think we are: the old hook contents. Let's actually test that by echoing the contents of the script to the hook file name so our test works correctly. While we're at it, we need to properly escape the dollar sign in `$@`, since otherwise it gets substituted before we write the script.
In some cases, users may use `core.hooksPath` to locate their hooks in a different location. However, right now, our hook and installation instructions mention only `.git/hooks`. We can update the instructions without a problem, but we don't want to hard-code the hook path into the hooks themselves because of things like symlinks and moved repository, plus the fact that we can't update a hook automatically unless it's identical minus some whitespace changes. To avoid spuriously failing to update a hook, let's print the right location with the instructions, and just mention `core.hookspath` and `.git/hooks` in the message, leaving it to the user to discover. Note that technically, core.hookspath was not implemented until Git 2.9.0. However, while we still support older versions of Git, no presently supported version of Ubuntu or Debian offers a version older than 2.11, so the risk of practical confusion by mentioning this is low. Nevertheless, make our tests pass by checking for an old Git explicitly.
bk2204
force-pushed
the
core-hookspath-update
branch
from
ac24d2a to
86a8d73
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
In some cases, users may use
core.hooksPathto locate their hooks in a different location. However, right now, our hook and installation instructions mention only.git/hooks.We can update the instructions without a problem, but we don't want to hard-code the hook path into the hooks themselves because of things like symlinks and moved repository, plus the fact that we can't update a hook automatically unless it's identical minus some whitespace changes. To avoid spuriously failing to update a hook, let's print the right location with the instructions, and just mention
core.hookspathand.git/hooksin the message, leaving it to the user to discover.While we're at it, fix a small portion of the test which wasn't testing what we thought it was in a preparatory commit. The gory details are mentioned in the commit message.