From: Stephen R. van den Berg Date: Sun, 27 Apr 2008 17:32:46 GMT Subject: [updated PATCH] Same default as cvsimport when using --use-log-author Message-ID: <20080427173246.10023.5687.stgit@aristoteles.cuci.nl> When using git-cvsimport, the author is inferred from the cvs commit, e.g. cvs commit logname is foobaruser, then the author field in git results in: Author: foobaruser Which is not perfect, but perfectly acceptable given the circumstances. The default git-svn import however, results in: Author: foobaruser When using mixes of imports, from CVS and SVN into the same git repository, you'd like to harmonise the imports to the format cvsimport uses. git-svn supports an experimental option --use-log-author which currently results in: Author: foobaruser This patches harmonises the result with cvsimport, and makes git-svn --use-log-author produce: Author: foobaruser Signed-off-by: Stephen R. van den Berg --- git-svn.perl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index b151049..846e739 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -2434,6 +2434,9 @@ sub make_log_entry { } else { ($name, $email) = ($name_field, 'unknown'); } + if (!defined $email) { + $email = $name; + } } if (defined $headrev && $self->use_svm_props) { if ($self->rewrite_root) {