merge: http://linuxtv.org/hg/~mkrufky/tda18271-fix

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 13 insertions, 1 deletions

diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl
index 7b3f3106d..af8b7914f 100755
--- a/v4l/scripts/hghead.pl
+++ b/v4l/scripts/hghead.pl
@@ -45,15 +45,23 @@ while ($line = <IN>) {
 		last;
 	}
 
+	if ($line =~ m/^# Date\s*(.*)/) {
+		print "#Date: $1\n";
+	}
+
 	if ($line =~ m/^Date:\s*(.*)/) {
 		my $time = str2time($1);
 
 		if ($time) {
+			print "#Date: $time\n";
+		} else {
 			print "#Date: $1\n";
 		}
 		next;
 	}
 
+	$line =~ s/^#\sUser/From:/;
+
 	my $tag=$line;
 	my $arg=$line;
 	$tag =~ s/\s*([^\s]+:)(.*)\n/\1/;
@@ -139,6 +147,9 @@ while ($line = <IN>) {
 		next;
 	}
 	if ($sub_ok == 0) {
+		if ($line =~ m/^\s*\n/) {
+			next;
+		}
 		$sub_ok=1;
 		substr( $subject, 0, 1 ) = uc (substr ($subject, 0, 1));
 		if ($subject =~ m|V4L\/DVB\s*(.+)|) {
@@ -180,10 +191,11 @@ if (!$signed =~ m/$from/) {
 	die;
 }
 
+$body="$from\n$body";
 $body=~s/[\n\s]+$//;
 $body=~s/^[\n\s]+//;
 
 # First from is used by hg to recognize commiter name
 print "#Committer: $maintainer_name <$maintainer_email>\n";
-print "$subject\n$from\n$body\n\n$signed";
+print "$subject\n$body\n\n$signed";