From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 17:00:44 +0000 (+0100)
Subject: git-debrebase: merge: Introduce new merge_failed sub
X-Git-Tag: archive/debian/6.7~93
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=49e8f18bc896d9a9dd8aedb3495854c39439c86c;hp=c57fd0c0dac97a1a3c683e479cc2d4d0fdc89060

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 <ijackson@chiark.greenend.org.uk>
---

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}, @_); };