From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v3 0/4] git add --resolved
Date: Sat, 01 Aug 2026 14:45:07 -0700 [thread overview]
Message-ID: <xmqqjyq97bx8.fsf@gitster.g> (raw)
In-Reply-To: <xmqqv79t9101.fsf@gitster.g> (Junio C. Hamano's message of "Sat, 01 Aug 2026 10:58:06 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Jeff King <peff@peff.net> writes:
>
>> That doesn't seem too bad to me. I was mostly worried about (1), but
>> after digging into it, I think I've convinced myself that it's a
>> non-issue.
>
> Yeah, our merges that began with "read-tree -m -u" have never merged
> into a path with local modification in it, so I have blindly
> assuming that (1) is a given. I think "ort" did not change it, but
> quite honestly I do not know where the more recent invention that
> renames paths that existed only on one side to follow adjacent paths
> that were renamed from the same directory guarantees property (1),
> so in these new code paths my assumption truly is a blind faith X-<.
So I got curious, and found out that t6423 has a test labelled as
"Testcase 11b" that covers this exact case. So it is a bit better
than blind faith now ;-).
prev parent reply other threads:[~2026-08-01 21:45 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-28 21:52 [PATCH 0/4] git add --resolved Junio C Hamano
2026-07-28 21:52 ` [PATCH 1/4] merge-ll: consolidate conflict marker scanning logic Junio C Hamano
2026-07-28 21:52 ` [PATCH 2/4] read-cache: add remove_file_from_index_with_flags() Junio C Hamano
2026-07-28 21:52 ` [PATCH 3/4] add: introduce '--resolved' option Junio C Hamano
2026-07-29 3:28 ` Michael Montalbo
2026-07-29 13:43 ` Junio C Hamano
2026-07-29 13:49 ` Junio C Hamano
2026-08-02 2:23 ` Junio C Hamano
2026-07-29 15:01 ` Junio C Hamano
2026-08-02 0:49 ` Michael Montalbo
2026-08-02 22:38 ` Junio C Hamano
2026-08-03 1:15 ` Michael Montalbo
2026-07-28 21:52 ` [PATCH 4/4] read-cache: reindent Junio C Hamano
2026-07-29 17:25 ` [PATCH v2 0/4] git add --resolved Junio C Hamano
2026-07-29 17:25 ` [PATCH v2 1/4] read-cache: reindent Junio C Hamano
2026-07-29 17:25 ` [PATCH v2 2/4] merge-ll: consolidate conflict marker scanning logic Junio C Hamano
2026-07-29 17:25 ` [PATCH v2 3/4] read-cache: add remove_file_from_index_with_flags() Junio C Hamano
2026-07-29 17:25 ` [PATCH v2 4/4] add: introduce '--resolved' option Junio C Hamano
2026-07-29 22:19 ` Junio C Hamano
2026-07-29 23:41 ` [PATCH v2 0/4] git add --resolved Michael Montalbo
2026-07-30 8:41 ` Junio C Hamano
2026-08-02 0:22 ` Michael Montalbo
2026-07-31 12:56 ` [PATCH v3 " Junio C Hamano
2026-07-31 12:56 ` [PATCH v3 1/4] read-cache: reindent Junio C Hamano
2026-07-31 12:56 ` [PATCH v3 2/4] merge-ll: consolidate conflict marker scanning logic Junio C Hamano
2026-07-31 12:56 ` [PATCH v3 3/4] read-cache: add remove_file_from_index_with_flags() Junio C Hamano
2026-07-31 12:56 ` [PATCH v3 4/4] add: introduce '--resolved' option Junio C Hamano
2026-08-01 14:14 ` [PATCH v3 0/4] git add --resolved Jeff King
2026-08-01 17:58 ` Junio C Hamano
2026-08-01 21:45 ` Junio C Hamano [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=xmqqjyq97bx8.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.