summaryrefslogtreecommitdiff
path: root/perl
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2014-10-29 20:10:29 (GMT)
committerEric Wong <normalperson@yhbt.net>2014-10-30 08:29:43 (GMT)
commit4ae9a7b966e61d25605b575163964f8375e37c9a (patch)
tree455596eda043def847c51574610d441a8ca6eea0 /perl
parent835e3ddeff2ae75b1fe71388686d44c536f2ed55 (diff)
downloadgit-4ae9a7b966e61d25605b575163964f8375e37c9a.zip
git-4ae9a7b966e61d25605b575163964f8375e37c9a.tar.gz
git-4ae9a7b966e61d25605b575163964f8375e37c9a.tar.bz2
git-svn: (cleanup) remove editor param passing
Neither find_extra_svk_parents or find_extra_svn_parents ever used the `$ed' parameter. Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'perl')
-rw-r--r--perl/Git/SVN.pm10
1 files 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 $!;