Hi, On Fri, 11 Jan 2008, Kevin Ballard wrote: > Somehow I managed to change the case of a directory without git > realizing it. I thought I issued `git mv CS4536 cs4536` but since that > won't work in my efforts to reproduce the problem, I must have simply > issued the `mv` outside of git and then re-added it. > > Anyway, here's the state of my directory: > > kevin@KBALLARD:~/Documents/School/C07> git ls-tree HEAD > 040000 tree b47c8103e2e01fcf145bdc237c0e56ffc61f1c47 CS4536 > 040000 tree dbf7fc51ef3effebdf9b4e9172e4c86cae52b163 cs4536 > 040000 tree 15834a7b6534a285bf6930be4e5404b37e1dc718 ece3601 > 040000 tree 62d229b8c4a389b550df20a3752d666c48c767a4 ma2071 > > Note that I have both versions of the directory present. Unfortunately, > only one of them can be present on the filesystem. If I run `mv cs4536 > CS4536; git reset --hard` I end up with a different working tree. > > Git should be able to detect this sort of conflict on a case-insensitive > system. Do not blame git for the shortcomings of your setup! However, as luck has it, I looked into this issue again, as somebody raised it with msysgit (for obvious reasons; file systems on Windows are case challenged). If you are serious about this problem, I can give you tons of pointers how to go solve it. (Although I might be disconnected this weekend, because of the lack of competence of the IT department here.) Ciao, Dscho - 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