From: Graham Knop <haarg@haarg.org>
Date: Sat, 9 Feb 2013 02:22:00 +0000 (-0500)
Subject: allow being ahead of remote but not divergent
X-Git-Tag: v0.001000~14
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=325f6231defb13059863d765130d33560fd4a5a6;p=p5sagit%2FDistar.git

allow being ahead of remote but not divergent
---

diff --git a/lib/Distar.pm b/lib/Distar.pm
index 3e2dad9..8e33320 100644
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -68,7 +68,7 @@ sub run_preflight {
 
   for (scalar `git status`) {
     /^# On branch master/ || die "Not on master. EEEK";
-    /Your branch is (behind|ahead of)/ && die "Not synced with upstream";
+    /Your branch is behind|Your branch and .*? have diverged/ && die "Not synced with upstream";
   }
 
   for (scalar `git diff`) {