summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2014-07-31 14:52:30 -0700
committerWayne Davison <wayned@samba.org>2014-07-31 14:52:30 -0700
commitf438d5abe08bb9164478111d3e5c11200abb2baf (patch)
treeebdeed40d84964d80b4d4a2b1848d2160bbd99aa
parent6fe798392bdbdeb34d01b15de7f0123df3bbe850 (diff)
downloadrsync-f438d5abe08bb9164478111d3e5c11200abb2baf.tar.gz
rsync-f438d5abe08bb9164478111d3e5c11200abb2baf.tar.bz2
rsync-f438d5abe08bb9164478111d3e5c11200abb2baf.zip
Match latest git's repo branch message.
-rwxr-xr-xpackaging/nightly-rsync2
1 files changed, 1 insertions, 1 deletions
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;