summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c57fd0c)
And call it from $nomerge in walk. Now we produce a sane error
message.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
# our own patch identification algorithm?
# this is an alternative strategy
# 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;
sub mwrecknote ($$$) {
my ($wrecknotes, $reftail, $commitish) = @_;
confess unless defined $commitish;
- fail "something useful about failed merge attempt @_ xxx".Dumper($cl);
+ my ($emsg) = @_;
+ merge_failed $cl->{MergeWreckNotes}, $emsg;
};
my $mwrecknote = sub { &mwrecknote($cl->{MergeWreckNotes}, @_); };
};
my $mwrecknote = sub { &mwrecknote($cl->{MergeWreckNotes}, @_); };