Skip to content

Fix Windows path issues #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 22, 2016
Merged

Fix Windows path issues #15

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e34973
Don't loop forever on Windows if .git folder is missing
cinderblock Feb 21, 2016
150ea52
Fix non-POSIX (Windows) separators
cinderblock Feb 21, 2016
f56a4be
git-hooks is a registered npm module. No need to use the full path.
cinderblock Feb 21, 2016
f0aa267
Fix indentation
cinderblock Feb 21, 2016
6bec342
remove un-used util
cinderblock Feb 21, 2016
b1040ee
Revert "git-hooks is a registered npm module. No need to use the full…
cinderblock Feb 22, 2016
480aabf
Revert "remove un-used util"
cinderblock Feb 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions lib/git-hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ module.exports = {

var hookTemplate = fs.readFileSync(__dirname + '/' + HOOKS_TEMPLATE_FILE_NAME);
var pathToGitHooks = path.relative(hooksPath, __dirname);
// Fix non-POSIX (Windows) separators
pathToGitHooks = pathToGitHooks.replace(new RegExp(path.sep.replace(/\\/g, '\\$&'), 'g'), '/');
var hook = util.format(hookTemplate.toString(), pathToGitHooks);

fsHelpers.makeDir(hooksPath);
Expand Down Expand Up @@ -177,13 +179,18 @@ function spawnHook(hookName, args) {
*/
function getClosestGitPath(currentPath) {
currentPath = currentPath || __dirname;
// reaches the fs root
if (currentPath === '/') {

var dirnamePath = path.join(currentPath, '.git');

if (fsHelpers.exists(dirnamePath)) {
return dirnamePath;
}

var nextPath = path.resolve(currentPath, '..');

if (nextPath === currentPath) {
return;
}
var dirnamePath = path.join(currentPath, '.git');

return fsHelpers.exists(dirnamePath) ?
dirnamePath :
getClosestGitPath(path.resolve(currentPath, '..'));
return getClosestGitPath(nextPath);
}