[Pkg-javascript-commits] [node-coveralls] 211/332: Merge remote-tracking branch 'upstream/master' into fix-bug-86

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-coveralls.

commit c5ff1af8ce1ac7655ce16804668395697b192048
Merge: ebb47a9 64653c6
Author: Hauke Henningsen <sqrt at entless.org>
Date:   Wed Jul 15 22:19:50 2015 +0200

    Merge remote-tracking branch 'upstream/master' into fix-bug-86
    
    Conflicts:
    	lib/fetchGitData.js

 README.md           | 25 +++++++++++--------------
 lib/fetchGitData.js |  2 +-
 package.json        |  6 ++++--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --cc lib/fetchGitData.js
index a6abba4,0c516d3..f04720e
--- a/lib/fetchGitData.js
+++ b/lib/fetchGitData.js
@@@ -59,7 -59,7 +59,7 @@@ function fetchBranch(git, cb) 
    });
  }
  
- var REGEX_COMMIT_DETAILS = /\nauthor (.+?) <([^>]*)>.+\ncommitter (.+?) <([^>]*)>.+\n?[\S\s]+?\n\n(.*)/m;
 -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) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-coveralls.git