aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2008-04-22 06:07:47 -0400
committerJunio C Hamano <gitster@pobox.com>2008-04-22 21:39:10 -0700
commit9231f500c394ede405fcfdca151dd7758ce99ced (patch)
treec945b57b387db44f2e35920a4bc62c5222584f95
parent75b7dfbdc030cfc6f09a6317444c36c4957a9133 (diff)
downloadgit-9231f500c394ede405fcfdca151dd7758ce99ced.tar.gz
git-9231f500c394ede405fcfdca151dd7758ce99ced.tar.xz
git-svn bug with blank commits and author file
When trying to import from svn using an author file, git-svn bails out if it encounters a blank author. The attached patch changes this behavior and allow using the author file with blanks authors. I came across this bug while importing from a cvs2svn repo where the initial revision (1) has a blank author. This doesn't break the behavior of bailing out when an unknown author is encountered. Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-svn.perl3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl
index e0434099c..fcfe4eeaa 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2363,8 +2363,7 @@ sub check_author {
my ($author) = @_;
if (!defined $author || length $author == 0) {
$author = '(no author)';
- }
- if (defined $::_authors && ! defined $::users{$author}) {
+ } elsif (defined $::_authors && ! defined $::users{$author}) {
die "Author: $author not defined in $::_authors file\n";
}
$author;