[Pkg-javascript-commits] [node-coveralls] 234/332: Merge pull request #85 from addaleax/branch-name-detection

[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 1b4d0a06585ee37a21551fe533e200a84a3ccd4f
Merge: 652d12f 05c4f1f
Author: Nick Merwin <n at mer.io>
Date:   Thu Dec 10 12:54:45 2015 -0800

    Merge pull request #85 from addaleax/branch-name-detection
    
    Accept more valid git branch names

 lib/detectLocalGit.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc lib/detectLocalGit.js
index 773eb70,bc9b6c4..ac8ed29
--- a/lib/detectLocalGit.js
+++ b/lib/detectLocalGit.js
@@@ -1,9 -1,10 +1,10 @@@
  var fs = require('fs');
  var path = require('path');
  
- var REGEX_BRANCH = /^ref: refs\/heads\/(\w+)$/;
+ // branch naming only has a few excluded characters, see git-check-ref-format(1)
+ var REGEX_BRANCH = /^ref: refs\/heads\/([^?*\[\\~^:]+)$/;
  
 -module.exports = function detectLocalGit(knownCommit, knownBranch) {
 +module.exports = function detectLocalGit() {
    var dir = process.cwd(), gitDir;
    while (path.resolve('/') !== dir) {
      gitDir = path.join(dir, '.git');

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