From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Jim Meyering <jim@meyering.net>, Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH 0/3] (hopefully) Proper fix to set show_all_errors where needed
Date: Thu, 2 Sep 2010 13:57:32 +0200 [thread overview]
Message-ID: <1283428655-12680-1-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <vpq39ttxumz.fsf@bauges.imag.fr>
So, after my toy untested patch, here's a cleaner version. I splitted
it into really small patches, to avoid modifying code while I move it,
but Junio, feel free to squash 1/3 and 2/3 if you prefer.
This fixes a regression, so this should be in the next release if the
patch is OK.
Jim: can you confirm if it fixes your problem?
Matthieu Moy (3):
Move set_porcelain_error_msgs to unpack-trees.c and rename it
setup_unpack_trees_porcelain: take the whole options struct as
parameter
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
builtin/checkout.c | 3 +-
builtin/merge.c | 3 +-
merge-recursive.c | 46 +-----------------------------------------
merge-recursive.h | 6 -----
unpack-trees.c | 56 +++++++++++++++++++++++++++++++++++++++++++++------
unpack-trees.h | 7 ++++++
6 files changed, 59 insertions(+), 62 deletions(-)
--
1.7.2.2.175.ga619d.dirty
next prev parent reply other threads:[~2010-09-02 11:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-30 9:40 [PATCH for next] insert missing newline in a diagnostic Jim Meyering
2010-09-01 0:17 ` Jonathan Nieder
2010-09-01 6:04 ` Matthieu Moy
2010-09-01 6:05 ` [PATCH] Make sure show_all_errors when using porcelain error messages Matthieu Moy
2010-09-01 14:59 ` Junio C Hamano
2010-09-01 17:04 ` Matthieu Moy
2010-09-01 17:54 ` Junio C Hamano
2010-09-02 11:57 ` Matthieu Moy [this message]
2010-09-03 14:18 ` [PATCH 0/3] (hopefully) Proper fix to set show_all_errors where needed Jim Meyering
2010-09-03 15:25 ` [PATCH] t7609-merge-co-error-msgs: test non-fast forward case too Matthieu Moy
2010-09-02 11:57 ` [PATCH 1/3] Move set_porcelain_error_msgs to unpack-trees.c and rename it Matthieu Moy
2010-09-02 11:57 ` [PATCH 2/3] setup_unpack_trees_porcelain: take the whole options struct as parameter Matthieu Moy
2010-09-02 11:57 ` [PATCH 3/3] Move "show_all_errors = 1" to setup_unpack_trees_porcelain() Matthieu Moy
2010-09-02 15:52 ` Junio C Hamano
2010-09-02 16:06 ` Matthieu Moy
2010-09-02 16:08 ` [PATCH v2] " Matthieu Moy
2010-09-02 8:20 ` [PATCH for next] insert missing newline in a diagnostic Jim Meyering
2010-09-02 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=1283428655-12680-1-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jim@meyering.net \
/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).