From: Elijah Newren <firstname.lastname@example.org> To: Junio C Hamano <email@example.com> Cc: Git Mailing List <firstname.lastname@example.org>, Adam Dinwoodie <email@example.com> Subject: Re: [PATCH] merge-recursive: ignore_case shouldn't reject intentional removals Date: Mon, 27 Nov 2017 08:40:17 -0800 [thread overview] Message-ID: <CABPp-BELci79tuiPFVRKQwm_-j6tN-DxqcKsvjD2xG_8ZWNxGw@mail.gmail.com> (raw) In-Reply-To: <firstname.lastname@example.org> [Removed cc's that just bounce] On Sun, Nov 26, 2017 at 7:40 PM, Junio C Hamano <email@example.com> wrote: > Elijah Newren <firstname.lastname@example.org> writes: > >> In commit ae352c7f3 (merge-recursive.c: fix case-changing merge bug, >> 2014-05-01), it was observed that removing files could be problematic on <snip> >> >> If that description leaves more questions than answers, we may need to >> augment the above commit message with the following explanation... >> ... >> merge-recursive.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > 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 until a few extra tweaks (from directory renames) caused us to want to remove a file from the working copy that was found at stage 0 in the index. Thus, the only testcase we can really use for this commit, is testcase 7b of the new t6043 added by that other patch series, and it's only valid with the code from that other series. When I submitted this patch, I was thinking about just including this fix with the next reroll of my rename-directory-detection series but it partially felt like an independent fix...but maybe I chose wrong. Would you prefer I include it in my next en/rename-directory-detection reroll?
next prev parent reply other threads:[~2017-11-27 16:40 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 [this message] 2017-11-27 23:39 ` Junio C Hamano 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 \ --in-reply-to=CABPp-BELci79tuiPFVRKQwm_-j6tN-DxqcKsvjD2xG_8ZWNxGw@mail.gmail.com \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --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).