From: Matthieu Moy Date: Sun, 29 Nov 2009 12:18:33 +0000 (+0100) Subject: builtin-merge: show user-friendly error messages for fast-forward too. X-Git-Tag: v1.6.6-rc1~9^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e2ced7de19c85f3b246480bfacdcc934c98c08ca;p=git.git builtin-merge: show user-friendly error messages for fast-forward too. 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin-merge.c b/builtin-merge.c index b6b84286b..56ecc6823 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -650,6 +650,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++])