From: Wayne Davison <wayned@samba.org>
Date: Thu, 31 Jul 2014 21:52:30 +0000 (-0700)
Subject: Match latest git's repo branch message.
X-Git-Tag: v3.1.2pre1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f438d5abe08bb9164478111d3e5c11200abb2baf;p=thirdparty%2Frsync.git

Match latest git's repo branch message.
---

diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index c33a7da9..44e85587 100755
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -40,7 +40,7 @@ if ($make_tar) {
     my $status = join('', <IN>);
     close IN;
     die "The checkout is not clean:\n", $status unless $status =~ /\nnothing to commit.+working directory clean/;
-    die "The checkout is not on the master branch.\n" unless $status =~ /^# On branch master\n/;
+    die "The checkout is not on the master branch.\n" unless $status =~ /^(?:# )?On branch master\n/;
     system "make $gen_target" and die "make $gen_target failed!\n";
 
     my @extra_files;