From: Graham Knop Date: Tue, 10 Dec 2013 16:04:31 +0000 (-0800) Subject: fix for new git X-Git-Tag: v0.002000~31 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=cc86b8ea0f61a08ddad056954de89775897d1ecc;p=p5sagit%2FDistar.git fix for new git --- diff --git a/lib/Distar.pm b/lib/Distar.pm index ee17e22..f27036d 100644 --- a/lib/Distar.pm +++ b/lib/Distar.pm @@ -86,7 +86,7 @@ sub run_preflight { } for (scalar `git status`) { - /^# On branch master/ || die "Not on master. EEEK"; + /^(?:# )?On branch master/ || die "Not on master. EEEK"; /Your branch is behind|Your branch and .*? have diverged/ && die "Not synced with upstream"; }