Merge branch 'lt/fix-sol-pack' into next

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 6c0f5d29380015fb4fb2c2948bb367e8d493e793..3728294e740b466b97f623302ddd89fab1ba0e92 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -881,6 +881,7 @@ ($$)
        }
        my $tip_at_end = `git-rev-parse --verify HEAD`;
        if ($tip_at_start ne $tip_at_end) {
+               for ($tip_at_start, $tip_at_end) { chomp; }
                print "Fetched into the current branch.\n" if $opt_v;
                system(qw(git-read-tree -u -m),
                       $tip_at_start, $tip_at_end);