cvs import: Strip whitespace at the end of the log entry

            for compatibility with old cvs2git.

1 files changed, 6 insertions, 1 deletions

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 8e0e4ac4b2..3f157725c8 100755
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -468,7 +468,12 @@ my $commit = sub {
 	}
 	$pw->writer();
 	$pr->reader();
-	print $pw $logmsg
+
+	# compatibility with git2cvs
+	substr($logmsg,32767) = "" if length($logmsg) > 32767;
+	$logmsg =~ s/[\s\n]+\z//;
+
+	print $pw "$logmsg\n"
 		or die "Error writing to git-commit-tree: $!\n";
 	$pw->close();