--- embedaddon/rsync/packaging/git-status.pl	2013/10/14 07:51:14	1.1.1.2
+++ embedaddon/rsync/packaging/git-status.pl	2016/11/01 09:54:32	1.1.1.3
@@ -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 = '';