diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 16:35:51 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 17:05:56 +0100 |
| commit | fb5e3be8a3afbc937518637ea54b4ed274589630 (patch) | |
| tree | 550e082a2e7face77ae4234bc4c92ff598f9800c /git-debrebase | |
| parent | 2da706781c3db5e34375a6c3c0b8f72135b70c55 (diff) | |
git-debrebase: merge: Add wreck note recording to merge_series
We also add a LeftRight to the merge base delta queue hashref, so that
it can be treated the same as the left and right delta queues.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 792e145..3d74d0e 100755 --- a/git-debrebase +++ b/git-debrebase @@ -388,6 +388,11 @@ sub merge_series ($$$;@) { my $result; + my $mwrecknote = sub { + my ($reftail, $commitish) = @_; + $wrecknotes->{$reftail} = $commitish; + }; + local $workarea = fresh_playground "$playprefix/merge"; my $seriesfile = "debian/patches/series"; in_workarea sub { @@ -441,6 +446,7 @@ sub merge_series ($$$;@) { printdebug "pec' $pec\n"; runcmd @git, qw(reset -q --hard), $pec; $q->{MR}{PEC} = $pec; + $mwrecknote->("$q->{LeftRight}-patchqueue"); } # now, because of reverse, we are on $input_q->{MR}{OQC} runcmd @git, qw(checkout -q -b merge); @@ -523,6 +529,7 @@ sub merge_series ($$$;@) { runcmd @git, qw(add), $seriesfile; runcmd @git, qw(commit --quiet -m), 'Merged patch queue form'; + $mwrecknote->('merged-patchqueue', git_rev_parse 'HEAD'); printdebug "merge_series series gbp pq import\n"; runcmd qw(gbp pq import); @@ -546,6 +553,8 @@ sub merge_series ($$$;@) { $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit); } $result = $build; + $mwrecknote->('merged-result', $result); + runcmd @git, qw(update-ref refs/heads/result), $result; runcmd @git, qw(checkout -q -b debug); @@ -554,6 +563,7 @@ sub merge_series ($$$;@) { runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE); my $mdebug = git_rev_parse 'HEAD'; printdebug sprintf "merge_series done debug=%s\n", $mdebug; + $mwrecknote->('merged-debug', $mdebug); }; printdebug "merge_series returns $result\n"; return $result; @@ -1291,7 +1301,9 @@ sub walk ($;$$$) { my $ibinfo = { SeriesTip => $btip, SeriesBase => $bbw, - Anchor => $banchor }; + Anchor => $banchor, + LeftRight => 'mergebase' }; + $bbw eq $bwb or $nomerge->("interchange merge-base ($ib)'s". " breakwater ($bbw)". |