Re: [PATCH v2 6/6] merge-ort: fix directory rename on top of source of other rename/delete

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 5, 2025, 20:18 UTC
Message-ID: <xmqq1pppzfnr.fsf@gitster.g>
In-Reply-To: <7238c8caf2b3c8c2516a8939c7590566cdaabd03.1754422546.git.gitgitgadget@gmail.com>

"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.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.