git-svn: skip mergeinfo handling with --no-follow-parent svn-nfp-mergeinfo

For repositories without parent following enabled, finding
git parents through svn:mergeinfo or svk::parents can be
expensive and pointless.

Reported-by: Александр Овчинников <proff@proff.email>
	http://mid.gmane.org/4094761466408188@web24o.yandex.ru

Signed-off-by: Eric Wong <e@80x24.org>

1 files changed, 16 insertions, 9 deletions

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index d94d01cfdc..bee1e7d1cb 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1905,15 +1905,22 @@ sub make_log_entry {
 
         my @parents = @$parents;
         my $props = $ed->{dir_prop}{$self->path};
-        if ( $props->{"svk:merge"} ) {
-                $self->find_extra_svk_parents($props->{"svk:merge"}, \@parents);
-        }
-        if ( $props->{"svn:mergeinfo"} ) {
-                my $mi_changes = $self->mergeinfo_changes
-                        ($parent_path, $parent_rev,
-                         $self->path, $rev,
-                         $props->{"svn:mergeinfo"});
-                $self->find_extra_svn_parents($mi_changes, \@parents);
+        if ($self->follow_parent) {
+                my $tickets = $props->{"svk:merge"};
+                if ($tickets) {
+                        $self->find_extra_svk_parents($tickets, \@parents);
+                }
+
+                my $mergeinfo_prop = $props->{"svn:mergeinfo"};
+                if ($mergeinfo_prop) {
+                        my $mi_changes = $self->mergeinfo_changes(
+                                                $parent_path,
+                                                $parent_rev,
+                                                $self->path,
+                                                $rev,
+                                                $mergeinfo_prop);
+                        $self->find_extra_svn_parents($mi_changes, \@parents);
+                }
         }
 
         open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;