From: Wayne Davison <wayned@samba.org>
Date: Mon, 6 Apr 2020 00:12:29 +0000 (-0700)
Subject: Another tweak for a change in git status.
X-Git-Tag: v3.2.0pre1~185
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0c03e2be992d20a7e1b9d1f7d4748a381026b3d;p=thirdparty%2Frsync.git

Another tweak for a change in git status.
---

diff --git a/packaging/git-status.pl b/packaging/git-status.pl
index 9d322e65..f68023ac 100644
--- a/packaging/git-status.pl
+++ b/packaging/git-status.pl
@@ -35,7 +35,8 @@ sub check_git_status
     my($fatal_unless_clean, $subdir) = @_;
     $subdir = '.' unless defined $subdir;
     my $status = `cd '$subdir' && git status`;
-    my $is_clean = $status =~ /\nnothing to commit.+working directory clean/;
+    my $is_clean = $status =~ /\nnothing to commit.+working (directory|tree) clean/;
+
     my($cur_branch) = $status =~ /^(?:# )?On branch (.+)\n/;
     if ($fatal_unless_clean && !$is_clean) {
 	if ($subdir eq '.') {