From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: git@vger.kernel.org
Cc: Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH 0/2] User-friendly error messages for merge failure on fast-forward.
Date: Sun, 29 Nov 2009 13:18:31 +0100 [thread overview]
Message-ID: <1259497113-1393-1-git-send-email-Matthieu.Moy@imag.fr> (raw)
I noticed that failures of fast-forward merges were still using the
plumbing error message:
$ git merge master
Updating 1fdeef9..e248dad
error: Entry 'foo.txt' not uptodate. Cannot merge.
I'm not 100% sure that my patch doesn't trigger the porcelain behavior
for plumbing. Someone more familiar than me with the codebase should
confirm/infirm this.
Matthieu Moy (2):
merge-recursive: make the error-message generation an extern function
builtin-merge: show user-friendly error messages for fast-forward
too.
builtin-merge.c | 1 +
merge-recursive.c | 41 +++++++++++++++++++++++------------------
merge-recursive.h | 3 +++
3 files changed, 27 insertions(+), 18 deletions(-)
next reply other threads:[~2009-11-29 12:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-29 12:18 Matthieu Moy [this message]
2009-11-29 12:18 ` [PATCH 1/2] merge-recursive: make the error-message generation an extern function Matthieu Moy
2009-11-29 12:18 ` [RFC/PATCH 2/2] builtin-merge: show user-friendly error messages for fast-forward too Matthieu Moy
2009-11-30 2:23 ` Junio C Hamano
2009-11-30 8:42 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1259497113-1393-1-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).