Update the gitweb/README file to include setting the GITWEB_CONFIG environment

[git.git] / git-svn.perl

diff --git a/git-svn.perl b/git-svn.perl
index 8a2ef9909cfa23dd3b588c6ada22995c25ce4c54..f5c7d46341016a5ca77a52ad16fbcd8c3830678f 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1247,6 +1247,7 @@ sub assert_svn_wc_clean {
        }
        my @status = grep(!/^Performing status on external/,(`svn status`));
        @status = grep(!/^\s*$/,@status);
+       @status = grep(!/^X/,@status) if $_no_ignore_ext;
        if (scalar @status) {
                print STDERR "Tree ($SVN_WC) is not clean:\n";
                print STDERR $_ foreach @status;
@@ -2171,7 +2172,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];
        }