Merge pull request #29611 from johnstep/ps-make-dco

Fix regular expression for PowerShell DCO check
This commit is contained in:
Sebastiaan van Stijn 2016-12-21 13:36:33 +01:00 committed by GitHub
commit 2d1b578e67

View file

@ -184,7 +184,7 @@ Function Validate-DCO($headCommit, $upstreamCommit) {
$usernameRegex='[a-zA-Z0-9][a-zA-Z0-9-]+'
$dcoPrefix="Signed-off-by:"
$dcoRegex="^(Docker-DCO-1.1-)?$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)>( \\(github: ($usernameRegex)\\))?$"
$dcoRegex="^(Docker-DCO-1.1-)?$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)>( \(github: ($usernameRegex)\))?$"
$counts = Invoke-Expression "git diff --numstat $upstreamCommit...$headCommit"
if ($LASTEXITCODE -ne 0) { Throw "Failed git diff --numstat" }