Skip to content
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

Jump to bottom

Fix gitDir Bug for git specific executables #162

Merged
merged 9 commits into from
May 17, 2017
Merged

Fix gitDir Bug for git specific executables #162

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a5d87f1
change npm to git since gitDir is only used for git executables
DeFuex May 8, 2017
f0e082c
fix(gitDir): `gitDir` should only be applied when using `git` binary
May 16, 2017
7a47c34
Merge branch 'fix/gitDirBug' into fix/gitDirBug
DeFuex May 16, 2017
68c0b45
Merge pull request #1 from billyvg/fix/gitDirBug
DeFuex May 17, 2017
85a56e7
remove unnecessary `genMockFromModule` call for `execa`
May 17, 2017
3cc0468
fix: promise warnings in tests because of mocked `execa`
May 17, 2017
d96a160
Add test for running a non-npm script, and non-git command, with `git…
May 17, 2017
81f9f34
Add test for `runScript` with a mocked `findBin` that returns an abso…
May 17, 2017
15cd436
Merge pull request #2 from billyvg/fix/gitDirBug
DeFuex May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/runScript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ module.exports = function runScript(commands, pathsToLint, packageJson, options)
task: () => {
try {
const res = findBin(linter, pathsToLint, packageJson, options)
// Only use gitDir as CWD if we are using the git binary
// e.g `npm` should run tasks in the actual CWD
const execaOptions =
res.bin !== 'npm' && options && options.gitDir ? { cwd: options.gitDir } : {}
res.bin.endsWith('git') && options && options.gitDir ? { cwd: options.gitDir } : {}
return new Promise((resolve, reject) => {
execa(res.bin, res.args, execaOptions)
.then(() => {
Expand All @@ -29,4 +31,3 @@ ${ err.stdout }`))
}
}))
}