From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 29 Apr 2014 23:13:28 +0000 (+0100)
Subject: Avoid printing removed lines unless necessary; avoid version headers.
X-Git-Tag: cvs-to-git-conversion^2~2^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=commitdiff_plain;h=95360dba667df074a6d5ca632fb4ec4ec551e40d

Avoid printing removed lines unless necessary; avoid version headers.
---

diff --git a/convert b/convert
index eb1ca3c..7541ff1 100755
--- a/convert
+++ b/convert
@@ -93,7 +93,8 @@ perl -ne '
 		$out .= $_;
 	END {
 		if ($out =~ m/^\@\@/s &&
-		    $out =~ m/^(?:\+ )?[^\@ ].*\w.*$/m) {
+		    ($out =~ m/^\+(?!u?adns).*\w.*$/m ||
+		     $out =~ m/^\-(?!u?adns).*\w.*$/m)) {
 			print $&, "\n\n" or die $!;
 		}
 		print $out or die $!;