projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
diff-files: show diffs with stage0 and unmerged stage at the same time.
[git.git]
/
git-cvsexportcommit.perl
diff --git
a/git-cvsexportcommit.perl
b/git-cvsexportcommit.perl
index
da7dcda
..
5a8c011
100755
(executable)
--- a/
git-cvsexportcommit.perl
+++ b/
git-cvsexportcommit.perl
@@
-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`;
# grab the commit message
`git-cat-file commit $commit | sed -e '1,/^\$/d' > .msg`;
-$? && die "Error extracti
on
the commit message";
+$? && die "Error extracti
ng
the commit message";
my (@afiles, @dfiles, @mfiles);
my @files = `git-diff-tree -r $parent $commit`;
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";
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";
print "\n $cmd\n\n";
- exit;
+ exit
(1)
;
}
}