Hi, At $dayjob we recently had a problem where a developer pushed a commit that added new files, two of which were named "foobar.TXT" and "FOOBAR.txt". When this commit (or anything based on it) is checked out by one of our Windows developers, Git maps two files in its index to a single file on the filesystem, and ends up reporting a diff on one of those files. The diff won't go away unless one (or both) of the case-colliding files is removed from the repo. Obivously, the persisting diff prevents the developer from easily rebasing, switching branches, merging, bisecting and a number of other useful tasks. The root of the problem is that the case-colliding files were added in the first place, and this should obviously be prevented in projects that aim to be compatible with case-insensitive filesystems. To that end, I'm currently writing an update hook which will prevent case-colliding files from being pushed to our central repo. However, given that this has already happened, how can we design Git to handle this situation more gracefully. In other words, how can we better handle checking out filenames that collide on case-insensitive filesystems? My first idea was to simply refuse checking out trees with case-colliding filenames. I.e. when core.ignoreCase is enabled, we check whether any of the files we're about to checkout map to the same filesystem representation, and if they do, we abort the checkout and complain loudly to the user. However, that doesn't really help the user at all. Failure to checkout would only make it much harder to fix the issue. A colleague suggested instead that Git should notice that the collision will occur, and work around the failure to represent the repository objects in the file system with a one-to-one match. Either by checking out only _one_ of the colliding files, or by using a non-colliding name for the second file. After all, Git already has functionality for manipulating the file contents on checkout (CRLF conversion). Doesn't it make sense to add functionality for manipulating the _directory_ contents on checkout as well? Even if that makes sense, I'm not sure that implementing it will be straightforward. Are there better suggestions on how to deal with this? Thanks, ...Johan -- Johan Herland, <johan@xxxxxxxxxxx> www.herland.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html