From: Junio C Hamano <email@example.com> To: Elijah Newren <firstname.lastname@example.org> Cc: Git Mailing List <email@example.com>, Adam Dinwoodie <firstname.lastname@example.org> Subject: Re: [PATCH] merge-recursive: ignore_case shouldn't reject intentional removals Date: Tue, 28 Nov 2017 08:39:41 +0900 [thread overview] Message-ID: <email@example.com> (raw) In-Reply-To: <CABPp-BELci79tuiPFVRKQwm_-j6tN-DxqcKsvjD2xG_8ZWNxGw@mail.gmail.com> (Elijah Newren's message of "Mon, 27 Nov 2017 08:40:17 -0800") Elijah Newren <firstname.lastname@example.org> writes: >> As a fix, this sorely wants something new in t/ directory. > > Well, then perhaps I was wrong to submit it independent of my > directory rename series. As noted in the (very lengthy) extended > commit message explanation, the assumption the previous code made just > happened to work ... Here is what I wrote in What's cooking draft (which automatically gets copied to the merge log message and becomes part of release notes when a topic graduates) for this thing. Am I on the right track? The code internal to the recursive merge strategy was not fully prepared to see a path that is renamed to try overwriting another path that is only different in case on case insensitive systems. This does not matter in the current code, but will start to matter once the rename detection logic starts taking hints from nearby paths moving to some directory and moves a path that is otherwise not changed along with them.
next prev parent reply other threads:[~2017-11-27 23:39 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-11-24 19:59 Elijah Newren 2017-11-24 20:04 ` Eric Sunshine 2017-11-24 20:29 ` Elijah Newren 2017-11-25 3:29 ` Junio C Hamano 2017-11-25 22:35 ` Elijah Newren 2017-11-26 2:32 ` Junio C Hamano 2017-11-27 3:40 ` Junio C Hamano 2017-11-27 16:40 ` Elijah Newren 2017-11-27 23:39 ` Junio C Hamano [this message] 2017-11-28 1:02 ` Elijah Newren 2019-03-04 23:07 Woody Woodman 2019-03-06 14:23 ` Johannes Schindelin
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 \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH] merge-recursive: ignore_case shouldn'\''t reject intentional removals' \ /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
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).