From 24c28cd715b30ac9e0b669ddadc895e340ed0e9c Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 19 Mar 2019 09:35:59 -0700 Subject: [PATCH] Match the latest git "clean" text. --- packaging/nightly-rsync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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('', ); 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"; -- 2.47.2