From: Samuel Lijin <sxlijin@gmail.com>
To: git@vger.kernel.org
Cc: Samuel Lijin <sxlijin@gmail.com>
Subject: [PATCH v3 0/3] Fix --short/--porcelain options for git commit
Date: Sun, 15 Jul 2018 07:08:04 -0400 [thread overview]
Message-ID: <20180715110807.25544-1-sxlijin@gmail.com> (raw)
In-Reply-To: <20180426092524.25264-1-sxlijin@gmail.com>
Take 3. Addressed the issue that Junio turned up the last time I sent
this out for review.
I'm not entirely sure I like the way I added the tests in the first
patch, but it's unclear to me if there's actually a pattern for setting
up and tearing down the same env for multiple test methods. There are
also other tests in t7501 that rely on state left from earlier tests, so
it's not really clear to me what the best thing to do here is.
Also added a FIXME in the second patch for something I think should be
fixed, but doesn't make sense to fix in this patch series.
Samuel Lijin (3):
t7501: add merge conflict tests for dry run
wt-status: teach wt_status_collect about merges in progress
commit: fix exit code for --short/--porcelain
builtin/commit.c | 32 +++---
ref-filter.c | 3 +-
t/t7501-commit.sh | 49 +++++++--
wt-status.c | 260 +++++++++++++++++++++++++---------------------
wt-status.h | 13 +--
5 files changed, 208 insertions(+), 149 deletions(-)
--
2.18.0
next prev parent reply other threads:[~2018-07-15 21:56 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-18 3:06 [PATCH 0/2] Fix --short and --porcelain options for commit Samuel Lijin
2018-04-18 3:06 ` [PATCH 1/2] commit: fix --short and --porcelain Samuel Lijin
2018-04-18 18:38 ` Martin Ågren
[not found] ` <CAJZjrdW3X8eaSit85otKV2HvHmu0NDGcnnnrtxHME03q=eWW-Q@mail.gmail.com>
2018-04-19 3:55 ` Samuel Lijin
2018-04-20 7:08 ` Eric Sunshine
2018-04-18 3:06 ` [PATCH 2/2] wt-status: const-ify all printf helper methods Samuel Lijin
2018-04-26 9:25 ` [PATCH v2 0/2] Fix --short and --porcelain options for commit Samuel Lijin
2018-07-15 11:08 ` Samuel Lijin [this message]
2018-07-23 2:08 ` [PATCH v4 0/4] Rerolling patch series to fix t7501 Samuel Lijin
2018-07-30 22:15 ` Junio C Hamano
2018-07-23 2:09 ` [PATCH v4 1/4] t7501: add coverage for flags which imply dry runs Samuel Lijin
2018-07-23 2:09 ` [PATCH v4 2/4] wt-status: rename commitable to committable Samuel Lijin
2018-07-23 2:09 ` [PATCH v4 3/4] wt-status: teach wt_status_collect about merges in progress Samuel Lijin
2018-07-23 2:09 ` [PATCH v4 4/4] commit: fix exit code when doing a dry run Samuel Lijin
2018-07-15 11:08 ` [PATCH v3 1/3] t7501: add merge conflict tests for " Samuel Lijin
2018-07-17 17:05 ` Junio C Hamano
2018-07-17 17:45 ` Junio C Hamano
2018-07-15 11:08 ` [PATCH v3 2/3] wt-status: teach wt_status_collect about merges in progress Samuel Lijin
2018-07-17 17:15 ` Junio C Hamano
2018-07-15 11:08 ` [PATCH v3 3/3] commit: fix exit code for --short/--porcelain Samuel Lijin
2018-07-17 17:33 ` Junio C Hamano
2018-07-19 9:31 ` Samuel Lijin
2018-04-26 9:25 ` [PATCH v2 1/2] commit: fix --short and --porcelain options Samuel Lijin
2018-05-02 5:50 ` Junio C Hamano
2018-05-02 15:52 ` Samuel Lijin
2018-04-26 9:25 ` [PATCH v2 2/2] wt-status: const-ify all printf helper methods Samuel Lijin
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=20180715110807.25544-1-sxlijin@gmail.com \
--to=sxlijin@gmail.com \
--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).