diff options
| author | Nick Merwin <[email protected]> | 2015-12-10 12:23:26 -0800 |
|---|---|---|
| committer | Nick Merwin <[email protected]> | 2015-12-10 12:23:26 -0800 |
| commit | a73e333ace5aff211d5c392b60444355d02c3063 (patch) | |
| tree | fbdc256cb40f126925b7b2312b5aead3062fb6cb | |
| parent | 62455e648f4e5020ac8ea2efe3bf09696f8d65c5 (diff) | |
| parent | 624352aae91033a17ca7c83e3595ec970bcef1c5 (diff) | |
| download | node-coveralls-a73e333ace5aff211d5c392b60444355d02c3063.tar.xz node-coveralls-a73e333ace5aff211d5c392b60444355d02c3063.zip | |
Merge branch 'pr/110'
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | lib/detectLocalGit.js | 2 | ||||
| -rw-r--r-- | lib/getOptions.js | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index b6f134c..284a527 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: node_js node_js: - - '0.10' - - '0.11' + - stable + - 4.2 + - 0.10 + - 0.11 script: make test-coveralls diff --git a/lib/detectLocalGit.js b/lib/detectLocalGit.js index 302cd44..773eb70 100644 --- a/lib/detectLocalGit.js +++ b/lib/detectLocalGit.js @@ -3,7 +3,7 @@ var path = require('path'); var REGEX_BRANCH = /^ref: refs\/heads\/(\w+)$/; -module.exports = function detectLocalGit(knownCommit, knownBranch) { +module.exports = function detectLocalGit() { var dir = process.cwd(), gitDir; while (path.resolve('/') !== dir) { gitDir = path.join(dir, '.git'); diff --git a/lib/getOptions.js b/lib/getOptions.js index 79fde60..7ff73d7 100644 --- a/lib/getOptions.js +++ b/lib/getOptions.js @@ -68,7 +68,7 @@ var getBaseOptions = function(cb){ } if (!git_commit || !git_branch) { - var data = require('./detectLocalGit')(git_commit, git_branch); + var data = require('./detectLocalGit')(); if (data) { git_commit = git_commit || data.git_commit; git_branch = git_branch || data.git_branch; |
