Merge branch 'master' of github.com:nickmerwin/node-coveralls

nickmerwin · nickmerwin · commit 652d12f69ac9 · 2015-12-10T12:53:34.000-08:00
diff --git 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
@@ -54,5 +54,5 @@
     "url": "git://github.com/nickmerwin/node-coveralls.git"
   },
   "author": "Gregg Caines",
-  "license": "BSD"
+  "license": "BSD-2-Clause"
 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ function fetchBranch(git, cb) {`
`59`	`59`	`});`
`60`	`60`	`}`
`61`	`61`
`62`		`-var REGEX_COMMIT_DETAILS = /\nauthor (.+?) <(.+?)>.+\ncommitter (.+?) <(.+?)>.+[\S\s]?\n\n(.)/m;`
	`62`	`+var REGEX_COMMIT_DETAILS = /\nauthor (.+?) <([^>])>.+\ncommitter (.+?) <([^>])>.+[\S\s]?\n\n(.)/m;`
`63`	`63`
`64`	`64`	`function fetchHeadDetails(git, cb) {`
`65`	`65`	`exec('git cat-file -p ' + git.head.id, function(err, response) {`
Original file line number	Diff line number	Diff line change
`@@ -54,5 +54,5 @@`
`54`	`54`	`"url": "git://github.com/nickmerwin/node-coveralls.git"`
`55`	`55`	`},`
`56`	`56`	`"author": "Gregg Caines",`
`57`		`- "license": "BSD"`
	`57`	`+ "license": "BSD-2-Clause"`
`58`	`58`	`}`