diff options
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/git-debrebase b/git-debrebase index d101742..277e0f8 100755 --- a/git-debrebase +++ b/git-debrebase @@ -362,6 +362,11 @@ sub gbp_pq_export ($$$) { # our own patch identification algorithm? # this is an alternative strategy +sub mwrecknote ($$$) { + my ($wrecknotes, $reftail, $commitish) = @_; + $wrecknotes->{$reftail} = $commitish; +} + sub merge_series ($$$;@) { my ($newbase, $wrecknotes, $base_q, @input_qs) = @_; # $base_q{SeriesBase} $input_qs[]{SeriesBase} @@ -388,10 +393,7 @@ sub merge_series ($$$;@) { my $result; - my $mwrecknote = sub { - my ($reftail, $commitish) = @_; - $wrecknotes->{$reftail} = $commitish; - }; + my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); }; local $workarea = fresh_playground "$playprefix/merge"; my $seriesfile = "debian/patches/series"; @@ -1039,10 +1041,7 @@ sub walk ($;$$$) { fail "something useful about failed merge attempt @_ xxx".Dumper($cl); }; - my $mwrecknote = sub { - my ($reftail, $commitish) = @_; - $cl->{MergeWreckNotes}{$reftail} = $commitish; - }; + my $mwrecknote = sub { &mwrecknote($cl->{MergeWreckNotes}, @_); }; my $last_anchor; |