[RFC/PATCH 2/2] builtin-merge: show user-friendly error messages for fast-forward too.

From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Nov 29, 2009, 12:18 UTC
Message-ID: <1259497113-1393-3-git-send-email-Matthieu.Moy@imag.fr>
In-Reply-To: <1259497113-1393-1-git-send-email-Matthieu.Moy@imag.fr>

fadd069d03 (merge-recursive: give less scary messages when merge did not start, Sep 7 2009) introduced some friendlier error message for merge failure, but the messages were shown only for non-fast forward merges. This patch uses the same for fast-forward.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
This is where I'm not 100% sure I'm not breaking some plumbing.

 builtin-merge.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/builtin-merge.c b/builtin-merge.c
index 57eedd4..0dd363f 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -656,6 +656,7 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
 	opts.verbose_update = 1;
 	opts.merge = 1;
 	opts.fn = twoway_merge;
+	opts.msgs = get_porcelain_error_msgs();
 
 	trees[nr_trees] = parse_tree_indirect(head);
 	if (!trees[nr_trees++])

-- 
1.6.5.3.435.g5f2e3.dirty