From: Diane Gasselin <diane.gasselin@ensimag.imag.fr>
To: git@vger.kernel.org
Cc: Diane Gasselin <diane.gasselin@ensimag.imag.fr>
Subject: [RFC/ PATCH 0/5] unpack_trees: nicer error messages
Date: Wed, 9 Jun 2010 14:44:00 +0200 [thread overview]
Message-ID: <1276087446-25112-1-git-send-email-diane.gasselin@ensimag.imag.fr> (raw)
This patch serie aims at grouping merge and checkout errors messages by type
if possible, listing all the file concerned by the error type.
It was first introduced in the thread:
http://mid.gmane.org/7v63277f92.fsf@alter.siamese.dyndns.org
Diane (5):
tree-walk: do not stop when an error is detected
unpack_trees: group errors by type
unpack_trees_options: update porcelain messages
t3030: update porcelain expected message
t7609: test merge and checkout error messages
builtin/checkout.c | 2 +-
merge-recursive.c | 10 ++--
t/t3030-merge-recursive.sh | 8 ++-
t/t7609-merge-co-error-msgs.sh | 122 ++++++++++++++++++++++++++++++++++++++
tree-walk.c | 5 +-
unpack-trees.c | 128 +++++++++++++++++++++++++++++++++++++---
unpack-trees.h | 12 ++++
7 files changed, 270 insertions(+), 17 deletions(-)
create mode 100755 t/t7609-merge-co-error-msgs.sh
next reply other threads:[~2010-06-09 13:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-09 12:44 Diane Gasselin [this message]
2010-06-09 12:44 ` [RFC/ PATCH 0/5] unpack_trees: nicer error messages Diane Gasselin
2010-06-09 12:44 ` [RFC/ PATCH 1/5] tree-walk: do not stop when an error is detected Diane Gasselin
2010-06-09 12:44 ` [RFC/ PATCH 2/5] unpack_trees: group errors by type Diane Gasselin
2010-06-09 12:44 ` [RFC/ PATCH 3/5] unpack_trees_options: update porcelain messages Diane Gasselin
2010-06-09 12:44 ` [RFC/ PATCH 4/5] t3030: update porcelain expected message Diane Gasselin
2010-06-09 12:44 ` [RFC/ PATCH 5/5] t7609: test merge and checkout error messages Diane Gasselin
2010-06-09 20:47 ` Matthieu Moy
2010-06-09 21:10 ` Diane Gasselin
2010-06-09 21:31 ` Matthieu Moy
2010-06-09 16:51 ` [RFC/ PATCH 4/5] t3030: update porcelain expected message Junio C Hamano
2010-06-09 20:40 ` Matthieu Moy
2010-06-10 1:59 ` Jeff King
2010-06-10 7:47 ` Diane Gasselin
2010-06-09 13:19 ` [RFC/ PATCH 2/5] unpack_trees: group errors by type Diane Gasselin
2010-06-09 16:50 ` Junio C Hamano
2010-06-10 9:21 ` Diane Gasselin
2010-06-09 20:59 ` Matthieu Moy
2010-06-09 16:49 ` [RFC/ PATCH 1/5] tree-walk: do not stop when an error is detected Junio C Hamano
2010-06-09 17:18 ` Diane Gasselin
2010-06-09 20:54 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1276087446-25112-1-git-send-email-diane.gasselin@ensimag.imag.fr \
--to=diane.gasselin@ensimag.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).