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

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 8e0e4ac4b2e4bd2f8da3ad4511e5f9af371f9e2b..3f157725c8d3bcb8142b2e840d665c49ab8a24d1 100755 (executable)
--- 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();