From: Taylor Blau <me@ttaylorr.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 0/7] unresolve removal
Date: Fri, 4 Aug 2023 15:03:09 -0400 [thread overview]
Message-ID: <ZM1LbVp74cqpqQ0A@nand.local> (raw)
In-Reply-To: <20230731224409.4181277-1-gitster@pobox.com>
On Mon, Jul 31, 2023 at 03:44:02PM -0700, Junio C Hamano wrote:
> Documentation/git-checkout.txt | 9 ++-
> Documentation/git-restore.txt | 4 ++
> builtin/checkout.c | 15 +++--
> builtin/update-index.c | 98 ++++----------------------------
> rerere.c | 2 +-
> resolve-undo.c | 101 ++++++++++++---------------------
> resolve-undo.h | 5 +-
> t/t2030-unresolve-info.sh | 45 +++++++++++++--
> t/t2070-restore.sh | 71 ++++++++++++++++++++++-
> t/t7201-co.sh | 47 +++++++++++++++
> 10 files changed, 230 insertions(+), 167 deletions(-)
I am not so familiar with this area, so take my review with a healthy
grain of salt, but this all LGTM.
Thanks,
Taylor
prev parent reply other threads:[~2023-08-04 19:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-31 22:44 [PATCH 0/7] unresolve removal Junio C Hamano
2023-07-31 22:44 ` [PATCH 1/7] update-index: do not read HEAD and MERGE_HEAD unconditionally Junio C Hamano
2023-07-31 22:44 ` [PATCH 2/7] resolve-undo: allow resurrecting conflicted state that resolved to deletion Junio C Hamano
2023-07-31 22:44 ` [PATCH 3/7] update-index: use unmerge_index_entry() to support removal Junio C Hamano
2023-07-31 23:14 ` Junio C Hamano
2023-07-31 22:44 ` [PATCH 4/7] update-index: remove stale fallback code for "--unresolve" Junio C Hamano
2023-07-31 22:44 ` [PATCH 5/7] checkout/restore: refuse unmerging paths unless checking out of the index Junio C Hamano
2023-07-31 22:44 ` [PATCH 6/7] checkout/restore: add basic tests for --merge Junio C Hamano
2023-07-31 22:44 ` [PATCH 7/7] checkout: allow "checkout -m path" to unmerge removed paths Junio C Hamano
2023-08-04 19:03 ` Taylor Blau [this message]
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=ZM1LbVp74cqpqQ0A@nand.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).