Remove a CURLOPT_HTTPHEADER (un)setting

[git.git] / git-svn.perl

diff --git a/git-svn.perl b/git-svn.perl
index 54d784469af7b787190e80d277abf2a4782c7d3f..d411a343170cf8dce9d968b84f123855b03e53d3 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -396,6 +396,7 @@ sub cmd_set_tree {
        }
        $gs->set_tree($_) foreach @revs;
        print "Done committing ",scalar @revs," revisions to SVN\n";
+       unlink $gs->{index};
 }
 
 sub cmd_dcommit {
@@ -514,6 +515,7 @@ sub cmd_dcommit {
                        $last_rev = $cmt_rev;
                }
        }
+       unlink $gs->{index};
 }
 
 sub cmd_find_rev {
@@ -1374,6 +1376,7 @@ sub fetch_all {
 
        ($base, $head) = parse_revision_argument($base, $head);
        $ra->gs_fetch_loop_common($base, $head, \@gs, \@globs);
+       unlink $_->{index} foreach @gs;
 }
 
 sub read_all_remotes {
@@ -2363,11 +2366,20 @@ sub make_log_entry {
 
        my ($commit_name, $commit_email) = ($name, $email);
        if ($_use_log_author) {
-               if ($log_entry{log} =~ /From:\s+(.*?)\s+<(.*)>\s*\n/) {
-                       ($name, $email) = ($1, $2);
-               } elsif ($log_entry{log} =~
-                                     /Signed-off-by:\s+(.*?)\s+<(.*)>\s*\n/) {
+               my $name_field;
+               if ($log_entry{log} =~ /From:\s+(.*\S)\s*\n/i) {
+                       $name_field = $1;
+               } elsif ($log_entry{log} =~ /Signed-off-by:\s+(.*\S)\s*\n/i) {
+                       $name_field = $1;
+               }
+               if (!defined $name_field) {
+                       #
+               } elsif ($name_field =~ /(.*?)\s+<(.*)>/) {
                        ($name, $email) = ($1, $2);
+               } elsif ($name_field =~ /(.*)@/) {
+                       ($name, $email) = ($1, $name_field);
+               } else {
+                       ($name, $email) = ($name_field, 'unknown');
                }
        }
        if (defined $headrev && $self->use_svm_props) {
@@ -3033,6 +3045,20 @@ sub add_file {
 
 sub add_directory {
        my ($self, $path, $cp_path, $cp_rev) = @_;
+       my $gpath = $self->git_path($path);
+       if ($gpath eq '') {
+               my ($ls, $ctx) = command_output_pipe(qw/ls-tree
+                                                    -r --name-only -z/,
+                                                    $self->{c});
+               local $/ = "\0";
+               while (<$ls>) {
+                       chomp;
+                       $self->{gii}->remove($_);
+                       print "\tD\t$_\n" unless $::_q;
+               }
+               command_close_pipe($ls, $ctx);
+               $self->{empty}->{$path} = 0;
+       }
        my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#);
        delete $self->{empty}->{$dir};
        $self->{empty}->{$path} = 1;