Thread (2 messages) flat view 2 messages, 2 authors, 2017-11-27

Re: [PATCH] merge-recursive: ignore_case shouldn't reject intentional removals

From: Junio C Hamano <hidden>
Date: 2017-11-27 03:40:35

Elijah Newren [off-list ref] 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help