Match latest git's repo status messages.

diff --git a/packaging/git-status.pl b/packaging/git-status.pl
index 32cd437d83c06ee3440c678ba3099d2915c7c135..9d322e6550167d0cf24a29c5a5bfb303e6a11131 100644 (file)
--- a/packaging/git-status.pl
+++ b/packaging/git-status.pl
@@ -35,8 +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($cur_branch) = $status =~ /^# On branch (.+)\n/;
+    my $is_clean = $status =~ /\nnothing to commit.+working directory clean/;
+    my($cur_branch) = $status =~ /^(?:# )?On branch (.+)\n/;
     if ($fatal_unless_clean && !$is_clean) {
        if ($subdir eq '.') {
            $subdir = '';

diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index 3aaabcb252e90f5cfb3348e1cc9c7137b48a0ff1..c33a7da9f28bc489c82b2bf79c94f9e0e0c34042 100755 (executable)
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -39,7 +39,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 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";