summaryrefslogtreecommitdiff
path: root/git-svnimport.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-03 03:14:32 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-03 03:16:52 -0700
commitf23c75a8eca5eeabf9aaf303ee7e14a94da42ddc (patch)
treee8379d2e091dcdabb623ebbe8b7a1ee53be308a9 /git-svnimport.perl
parent160b7983034cdd24ea1bf6ef7a2532a2296461c6 (diff)
parent8fced61cbc32f0c4b81a3dcecfeb40b7d96339ce (diff)
downloadgit-f23c75a8eca5eeabf9aaf303ee7e14a94da42ddc.tar.gz
Merge branch 'master' into js/merge-base
This is to pull in the object-hash clean-up from the master branch.
Diffstat (limited to 'git-svnimport.perl')
-rwxr-xr-xgit-svnimport.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svnimport.perl b/git-svnimport.perl
index 38ac732ca9..26dc454795 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -534,7 +534,7 @@ sub commit {
my($author_name,$author_email,$dest);
my(@old,@new,@parents);
- if (not defined $author) {
+ if (not defined $author or $author eq "") {
$author_name = $author_email = "unknown";
} elsif (defined $users_file) {
die "User $author is not listed in $users_file\n"