From: Junio C Hamano <gitster@pobox.com>
To: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Patrick Steinhardt <ps@pks.im>,
Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH v2 6/6] merge-ort: fix directory rename on top of source of other rename/delete
Date: Tue, 05 Aug 2025 13:18:00 -0700 [thread overview]
Message-ID: <xmqq1pppzfnr.fsf@gitster.g> (raw)
In-Reply-To: <7238c8caf2b3c8c2516a8939c7590566cdaabd03.1754422546.git.gitgitgadget@gmail.com> (Elijah Newren via GitGitGadget's message of "Tue, 05 Aug 2025 19:35:46 +0000")
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> + return mi->clean || (side_mask & (ci->filemask | ci->dirmask))
> + /* See testcases 12{n,p,q} for more details on this next condition */
> + || ((ci->filemask & 0x01) &&
> + strcmp(p->one->path, path));
All the other references to testcase in this file tell the readers
which file to look at, but except for this one.
/* See testcases 12[npq] of t6423 */
or something, probably.
next prev parent reply other threads:[~2025-08-05 20:18 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-22 15:23 [PATCH 0/6] Fix various rename corner cases Elijah Newren via GitGitGadget
2025-07-22 15:23 ` [PATCH 1/6] merge-ort: update comments to modern testfile location Elijah Newren via GitGitGadget
2025-07-22 15:23 ` [PATCH 2/6] merge-ort: drop unnecessary temporary in check_for_directory_rename() Elijah Newren via GitGitGadget
2025-07-22 15:23 ` [PATCH 3/6] t6423: document two bugs with rename-to-self testcases Elijah Newren via GitGitGadget
2025-08-01 8:30 ` Patrick Steinhardt
2025-08-04 19:15 ` Elijah Newren
2025-08-05 4:38 ` Patrick Steinhardt
2025-08-05 18:33 ` Elijah Newren
2025-07-22 15:23 ` [PATCH 4/6] t6423: fix missed staging of file in testcases 12i,12j,12k Elijah Newren via GitGitGadget
2025-08-01 8:30 ` Patrick Steinhardt
2025-08-04 19:23 ` Elijah Newren
2025-08-05 4:38 ` Patrick Steinhardt
2025-08-05 18:33 ` Elijah Newren
2025-07-22 15:23 ` [PATCH 5/6] merge-ort: fix incorrect file handling Elijah Newren via GitGitGadget
2025-08-01 8:31 ` Patrick Steinhardt
2025-08-04 22:08 ` Elijah Newren
2025-08-05 4:39 ` Patrick Steinhardt
2025-08-05 18:34 ` Elijah Newren
2025-07-22 15:23 ` [PATCH 6/6] merge-ort: fix directory rename on top of source of other rename/delete Elijah Newren via GitGitGadget
2025-08-01 8:31 ` Patrick Steinhardt
2025-08-04 22:33 ` Elijah Newren
2025-08-01 8:31 ` [PATCH 0/6] Fix various rename corner cases Patrick Steinhardt
2025-08-05 19:35 ` [PATCH v2 " Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 1/6] merge-ort: update comments to modern testfile location Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 2/6] merge-ort: drop unnecessary temporary in check_for_directory_rename() Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 3/6] t6423: document two bugs with rename-to-self testcases Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 4/6] t6423: fix missed staging of file in testcases 12i,12j,12k Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 5/6] merge-ort: fix incorrect file handling Elijah Newren via GitGitGadget
2025-08-05 19:35 ` [PATCH v2 6/6] merge-ort: fix directory rename on top of source of other rename/delete Elijah Newren via GitGitGadget
2025-08-05 20:18 ` Junio C Hamano [this message]
2025-08-05 20:47 ` Elijah Newren
2025-08-06 23:15 ` [PATCH v3 0/7] Fix various rename corner cases Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 1/7] merge-ort: update comments to modern testfile location Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 2/7] merge-ort: drop unnecessary temporary in check_for_directory_rename() Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 3/7] t6423: document two bugs with rename-to-self testcases Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 4/7] t6423: fix missed staging of file in testcases 12i,12j,12k Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 5/7] merge-ort: clarify the interning of strings in opt->priv->path Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 6/7] merge-ort: fix incorrect file handling Elijah Newren via GitGitGadget
2025-08-06 23:15 ` [PATCH v3 7/7] merge-ort: fix directory rename on top of source of other rename/delete Elijah Newren via GitGitGadget
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=xmqq1pppzfnr.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=ps@pks.im \
/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.