From b0c03e2be992d20a7e1b9d1f7d4748a381026b3d Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sun, 5 Apr 2020 17:12:29 -0700 Subject: [PATCH] Another tweak for a change in git status. --- packaging/git-status.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 '.') { -- 2.47.2