summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Shawn Pearce <spearce@spearce.org>2006-09-24 23:04:55 -0400
committerLibravatar Junio C Hamano <junkio@cox.net>2006-09-24 20:19:28 -0700
commit8815788e93c0a5a2e47e067dfa0764b17b8d1ddd (patch)
treed42ba9602b8a9d0ad0639901b068e33de1ae624f
parentAllow 'svn fetch' on '(no date)' revisions in Subversion. (diff)
downloadtgif-8815788e93c0a5a2e47e067dfa0764b17b8d1ddd.tar.xz
Allow '(no author)' in git-svn's authors file.
When trying to import an SVN revision which has no author the Git user may desire to relabel '(no author)' to another name and email address with their svn.authorsfile. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 8a2ef9909c..017f45ac97 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2171,7 +2171,7 @@ sub load_authors {
open my $authors, '<', $_authors or die "Can't open $_authors $!\n";
while (<$authors>) {
chomp;
- next unless /^(\S+?)\s*=\s*(.+?)\s*<(.+)>\s*$/;
+ next unless /^(\S+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/;
my ($user, $name, $email) = ($1, $2, $3);
$users{$user} = [$name, $email];
}