From: Wayne Davison <wayned@samba.org>
Date: Tue, 19 Mar 2019 16:35:59 +0000 (-0700)
Subject: Match the latest git "clean" text.
X-Git-Tag: v3.2.0pre1~198
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24c28cd715b30ac9e0b669ddadc895e340ed0e9c;p=thirdparty%2Frsync.git

Match the latest git "clean" text.
---

diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index 23451ca7..74891baa 100755
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -40,7 +40,7 @@ if ($make_tar) {
     open(IN, '-|', 'git status') or die $!;
     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 clean:\n", $status unless $status =~ /\nnothing to commit.+working (directory|tree) clean/;
     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";