From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, Adam Dinwoodie <adam@dinwoodie.org>,
David Turner <dturner@twitter.com>,
David Turner <dturner@twopensource.com>
Subject: Re: [PATCH] merge-recursive: ignore_case shouldn't reject intentional removals
Date: Mon, 27 Nov 2017 12:40:28 +0900 [thread overview]
Message-ID: <xmqq4lpgfkyb.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171124195901.2581-1-newren@gmail.com> (Elijah Newren's message of "Fri, 24 Nov 2017 11:59:01 -0800")
Elijah Newren <newren@gmail.com> 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
> case insensitive file systems, because we could end up removing files
> that differed in case only rather than deleting the intended file --
> something that happened when files were renamed on one branch in a way
> that differed only in case. To avoid that problem, that commit added
> logic to avoid removing files other than the one intended, rejecting the
> removal if the files differed only in case.
>
> Unfortunately, the logic it used didn't fully implement that condition as
> stated above...
>
> 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.
next prev parent reply other threads:[~2017-11-27 3:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-24 19:59 [PATCH] merge-recursive: ignore_case shouldn't reject intentional removals 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 [this message]
2017-11-27 16:40 ` Elijah Newren
2017-11-27 23:39 ` Junio C Hamano
2017-11-28 1:02 ` Elijah Newren
-- strict thread matches above, loose matches on Subject: below --
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=xmqq4lpgfkyb.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=adam@dinwoodie.org \
--cc=dturner@twitter.com \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/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.