git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2025-12-13 00:06:03 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity

Pass CVSps generated A U Thor <author@domain.xz> intact.

Browse Source 
Alexey Nezhdanov updated CVSps to generate author-name and
author-email information in its output.

If the input looks like it has that already properly formatted,
use that without our own munging.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-09-30 01:48:57 -07:00
parent 37f15d50c9
commit 94c23343dc
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-cvsimport.perl
View File

@ -510,7 +510,7 @@ unless($pid) {
my $state = 0; my $state = 0;
my($patchset,$date,$author,$branch,$ancestor,$tag,$logmsg); my($patchset,$date,$author_name,$author_email,$branch,$ancestor,$tag,$logmsg);
my(@old,@new); my(@old,@new);
my $commit = sub { my $commit = sub {
my $pid; my $pid;
@ -591,11 +591,11 @@ my $commit = sub {
} }
exec("env", exec("env",
"GIT_AUTHOR_NAME=$author", "GIT_AUTHOR_NAME=$author_name",
"GIT_AUTHOR_EMAIL=$author", "GIT_AUTHOR_EMAIL=$author_email",
"GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)), "GIT_AUTHOR_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
"GIT_COMMITTER_NAME=$author", "GIT_COMMITTER_NAME=$author_name",
"GIT_COMMITTER_EMAIL=$author", "GIT_COMMITTER_EMAIL=$author_email",
"GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)), "GIT_COMMITTER_DATE=".strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date)),
"git-commit-tree", $tree,@par); "git-commit-tree", $tree,@par);
die "Cannot exec git-commit-tree: $!\n"; die "Cannot exec git-commit-tree: $!\n";
@ -638,7 +638,7 @@ my $commit = sub {
print $out "object $cid\n". print $out "object $cid\n".
"type commit\n". "type commit\n".
"tag $xtag\n". "tag $xtag\n".
"tagger $author <$author>\n" "tagger $author_name <$author_email>\n"
or die "Cannot create tag object $xtag: $!\n"; or die "Cannot create tag object $xtag: $!\n";
close($out) close($out)
or die "Cannot create tag object $xtag: $!\n"; or die "Cannot create tag object $xtag: $!\n";
@ -683,7 +683,11 @@ while(<CVS>) {
$state=3; $state=3;
} elsif($state == 3 and s/^Author:\s+//) { } elsif($state == 3 and s/^Author:\s+//) {
s/\s+$//; s/\s+$//;
$author = $_; if (/^(.*?)\s+<(.*)>/) {
($author_name, $author_email) = ($1, $2);
} else {
$author_name = $author_email = $_;
}
$state = 4; $state = 4;
} elsif($state == 4 and s/^Branch:\s+//) { } elsif($state == 4 and s/^Branch:\s+//) {
s/\s+$//; s/\s+$//;