summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-06 04:21:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-06 04:21:08 (GMT)
commit04bb50f45dda9aeb755e943cbc9df264cfc8cbc5 (patch)
treea863b7f6bcfee344db722621d08bdc1ddbbacc6f /git-cvsimport.perl
parentfba5279db904aa49bb75bb31614571b9b6d75b33 (diff)
parent2d0f5f3459278475602394a7165bf8919412f4e4 (diff)
downloadgit-04bb50f45dda9aeb755e943cbc9df264cfc8cbc5.zip
git-04bb50f45dda9aeb755e943cbc9df264cfc8cbc5.tar.gz
git-04bb50f45dda9aeb755e943cbc9df264cfc8cbc5.tar.bz2
Merge branch 'maint'
* maint: RelNotes 1.5.6.5 updates diff.renamelimit is a basic diff configuration git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout. Documentation: typos / spelling fixes in older RelNotes
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index e2664ef..e439202 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -952,7 +952,7 @@ while (<CVS>) {
} elsif (/^-+$/) { # end of unknown-line processing
$state = 1;
} elsif ($state != 11) { # ignore stuff when skipping
- print "* UNKNOWN LINE * $_\n";
+ print STDERR "* UNKNOWN LINE * $_\n";
}
}
commit() if $branch and $state != 11;