From 49e8f18bc896d9a9dd8aedb3495854c39439c86c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 18:00:44 +0100 Subject: [PATCH] git-debrebase: merge: Introduce new merge_failed sub And call it from $nomerge in walk. Now we produce a sane error message. Signed-off-by: Ian Jackson --- git-debrebase | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/git-debrebase b/git-debrebase index a6a02b11..abf9157e 100755 --- a/git-debrebase +++ b/git-debrebase @@ -368,6 +368,16 @@ sub gbp_pq_export ($$$) { # our own patch identification algorithm? # this is an alternative strategy +sub merge_failed ($$) { + my ($wrecknotes, $emsg) = @_; + my @m; + push @m, "Merge resolution failed: $emsg"; + + push @m, "See git-debrebase(1) section FAILED MERGES for suggestions."; + # ^ xxx this section does not yet exist + fail join '', map { "$_\n" } @m; +} + sub mwrecknote ($$$) { my ($wrecknotes, $reftail, $commitish) = @_; confess unless defined $commitish; @@ -1046,7 +1056,8 @@ sub walk ($;$$$) { }; my $nomerge = sub { - fail "something useful about failed merge attempt @_ xxx".Dumper($cl); + my ($emsg) = @_; + merge_failed $cl->{MergeWreckNotes}, $emsg; }; my $mwrecknote = sub { &mwrecknote($cl->{MergeWreckNotes}, @_); }; -- 2.30.2