aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Merwin <[email protected]>2015-12-10 12:53:34 -0800
committerNick Merwin <[email protected]>2015-12-10 12:53:34 -0800
commit652d12f69ac96e5e0a4a32e17c71a44f574a95b4 (patch)
tree7a57c901051e13aef6bf8a023481659b541c1fb4
parentd084add18e87fd1a292315de7c9eb171e8fd4b93 (diff)
parentc37548941c9c4db6eca962cd5baabebaf9ea5b40 (diff)
downloadnode-coveralls-652d12f69ac96e5e0a4a32e17c71a44f574a95b4.tar.xz
node-coveralls-652d12f69ac96e5e0a4a32e17c71a44f574a95b4.zip
Merge branch 'master' of github.com:nickmerwin/node-coveralls
-rw-r--r--lib/fetchGitData.js2
-rw-r--r--package.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/fetchGitData.js b/lib/fetchGitData.js
index 0c516d3..f04720e 100644
--- a/lib/fetchGitData.js
+++ b/lib/fetchGitData.js
@@ -59,7 +59,7 @@ function fetchBranch(git, cb) {
});
}
-var REGEX_COMMIT_DETAILS = /\nauthor (.+?) <(.+?)>.+\ncommitter (.+?) <(.+?)>.+[\S\s]*?\n\n(.*)/m;
+var REGEX_COMMIT_DETAILS = /\nauthor (.+?) <([^>]*)>.+\ncommitter (.+?) <([^>]*)>.+[\S\s]*?\n\n(.*)/m;
function fetchHeadDetails(git, cb) {
exec('git cat-file -p ' + git.head.id, function(err, response) {
diff --git a/package.json b/package.json
index b06a3f7..f9b4693 100644
--- a/package.json
+++ b/package.json
@@ -54,5 +54,5 @@
"url": "git://github.com/nickmerwin/node-coveralls.git"
},
"author": "Gregg Caines",
- "license": "BSD"
+ "license": "BSD-2-Clause"
}