X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-cvsexportcommit.perl;h=5a8c011802c46356c9c842282baca8f6fb54f01b;hb=706fe6ae03e2c1452d59892944701c56237b903f;hp=5bce39c4c4ad38f79fbcdfa38b2aecd932043464;hpb=0ff2ce9d8a305038c0c116cd1e3b478a9f5b81c1;p=git.git

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index 5bce39c4..5a8c0118 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -12,7 +12,7 @@ unless ($ENV{GIT_DIR} && -r $ENV{GIT_DIR}){
 
 our ($opt_h, $opt_p, $opt_v, $opt_c );
 
-getopt('hpvc');
+getopts('hpvc');
 
 $opt_h && usage();
 
@@ -78,7 +78,7 @@ $opt_v && print "Applying to CVS commit $commit from parent $parent\n";
 
 # grab the commit message
 `git-cat-file commit $commit | sed -e '1,/^\$/d' > .msg`;
-$? && die "Error extraction the commit message";
+$? && die "Error extracting the commit message";
 
 my (@afiles, @dfiles, @mfiles);
 my @files = `git-diff-tree -r $parent $commit`;
@@ -188,9 +188,9 @@ my $cmd = "cvs commit -F .msg $commitfiles";
 
 if ($dirtypatch) {
     print "NOTE: One or more hunks failed to apply cleanly.\n";
-    print "Resolve the conflicts and then commit using:n";
+    print "Resolve the conflicts and then commit using:\n";
     print "\n    $cmd\n\n";
-    exit;
+    exit(1);
 }