[PATCH] git-svn: (cleanup) remove editor param passing

From

EWEric Wong <normalperson@yhbt.net>

Date

Oct 30, 2014, 08:36 UTC

Message-ID

<1414658206-12629-1-git-send-email-normalperson@yhbt.net>

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 perl/Git/SVN.pm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 5f9d469..893b9a8 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1433,7 +1433,7 @@ sub check_author {
 }
 
 sub find_extra_svk_parents {
-	my ($self, $ed, $tickets, $parents) = @_;
+	my ($self, $tickets, $parents) = @_;
 	# aha!  svk:merge property changed...
 	my @tickets = split "\n", $tickets;
 	my @known_parents;
@@ -1736,7 +1736,7 @@ sub mergeinfo_changes {
 # note: this function should only be called if the various dirprops
 # have actually changed
 sub find_extra_svn_parents {
-	my ($self, $ed, $mergeinfo, $parents) = @_;
+	my ($self, $mergeinfo, $parents) = @_;
 	# aha!  svk:merge property changed...
 
 	memoize_svn_mergeinfo_functions();
@@ -1835,16 +1835,14 @@ sub make_log_entry {
 	my @parents = @$parents;
 	my $props = $ed->{dir_prop}{$self->path};
 	if ( $props->{"svk:merge"} ) {
-		$self->find_extra_svk_parents
-			($ed, $props->{"svk:merge"}, \@parents);
+		$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
-			($ed, $mi_changes, \@parents);
+		$self->find_extra_svn_parents($mi_changes, \@parents);
 	}
 
 	open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;

-- 
EW