index 5bce39c4c4ad38f79fbcdfa38b2aecd932043464..5a8c011802c46356c9c842282baca8f6fb54f01b 100755 (executable)
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
our ($opt_h, $opt_p, $opt_v, $opt_c );
-getopt('hpvc');
+getopts('hpvc');
$opt_h && usage();
# 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`;
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);
}