Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-cvsexportcommit.perl: fix typos in output
author
Kevin Geiss
<kevin@desertsol.com>
Mon, 14 Nov 2005 16:43:51 +0000
(09:43 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 16 Nov 2005 21:20:59 +0000
(13:20 -0800)
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-cvsexportcommit.perl
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
8b3fbee
)
diff --git
a/git-cvsexportcommit.perl
b/git-cvsexportcommit.perl
index d49494abc22c79bea15d60a503a971dcd1e7650e..5a8c011802c46356c9c842282baca8f6fb54f01b 100755
(executable)
--- a/
git-cvsexportcommit.perl
+++ b/
git-cvsexportcommit.perl
@@
-78,7
+78,7
@@
# 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,7
+188,7
@@
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";
exit(1);
}
print "\n $cmd\n\n";
exit(1);
}