diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 16:27:07 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 17:05:56 +0100 |
| commit | 27b7f56727ea182349a38136977553fc5a256394 (patch) | |
| tree | 2d85430d89f2536f13ee85738e5ba18ab07d9fc2 /git-debrebase | |
| parent | c10954df2a6f7ed9f12e12f6e65049d78c9672e4 (diff) | |
git-debrebase: merge: Pass wreckage hashref to merge_series
NFC so far.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase index 2a2d1ed..830cfd5 100755 --- a/git-debrebase +++ b/git-debrebase @@ -362,8 +362,8 @@ sub gbp_pq_export ($$$) { # our own patch identification algorithm? # this is an alternative strategy -sub merge_series ($$;@) { - my ($newbase, $base_q, @input_qs) = @_; +sub merge_series ($$$;@) { + my ($newbase, $wrecknotes, $base_q, @input_qs) = @_; # $base_q{SeriesBase} $input_qs[]{SeriesBase} # $base_q{SeriesTip} $input_qs[]{SeriesTip} # ^ specifies several patch series (currently we only support exactly 2) @@ -1392,7 +1392,7 @@ sub walk ($;$$$) { } elsif ($method eq 'MergeMergeSeries') { print "Running merge resolution for $cl->{CommitId}...\n"; $build = merge_series - $build, + $build, $cl->{MergeWreckNotes}, $cl->{MergeInterchangeBaseInfo}, @{ $cl->{Parents} }; $last_anchor = $cl->{MergeBestAnchor}; |