Re: git branch case insensitivity (Possible bug)
On 01/09/2013 04:46 PM, Alexander Gallego wrote: > Hello, > > Here is a pastebin where I've reproduced the steps on a clean git repo. > > http://pastebin.com/0vQZEat0 > > > > Brief description of the problem: > > > > 1.Basically one creates a local branch call it 'imp_fix' (branch off > master --> this doesn't matter) > 2.One does work, commit, etc > 3.One rebases imp_fix with master via: (inside imp_fix) git rebase master > 4.One checks out master via: git checkout master > 5.One merges an incorrect name "imp_Fix" (notice the capital F) > 6.The expected output is that git would say, silly you --> that branch > does not exist. > 7. Instead it merges (what I think is incorrectly) imp_fix. > > > Kindly let me know if I can provide more details. > Are you using Mac OSX? Are you using the HFS+ filesystem shipped with it? Did you use the filesystem's default settings rather than reinstall your system with sensible settings? If you said "yes" to all of the above, this is a filesystem "feature", courtesy of (cr)Apple, and you're screwed. You can work around it by running "git pack-refs" every time you create a branch or a tag though. -- Andreas Ericsson andreas.erics...@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 Considering the successes of the wars on alcohol, poverty, drugs and terror, I think we should give some serious thought to declaring war on peace. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: git branch case insensitivity (Possible bug)
On Wed, Jan 9, 2013 at 10:52 AM, Andreas Ericsson wrote: > On 01/09/2013 04:46 PM, Alexander Gallego wrote: >> Hello, >> >> Here is a pastebin where I've reproduced the steps on a clean git repo. >> >> http://pastebin.com/0vQZEat0 >> >> >> >> Brief description of the problem: >> >> >> >> 1.Basically one creates a local branch call it 'imp_fix' (branch off >> master --> this doesn't matter) >> 2.One does work, commit, etc >> 3.One rebases imp_fix with master via: (inside imp_fix) git rebase master >> 4.One checks out master via: git checkout master >> 5.One merges an incorrect name "imp_Fix" (notice the capital F) >> 6.The expected output is that git would say, silly you --> that branch >> does not exist. >> 7. Instead it merges (what I think is incorrectly) imp_fix. >> >> >> Kindly let me know if I can provide more details. >> > > Are you using Mac OSX? Yes > Are you using the HFS+ filesystem shipped with it? Likely. I have not touched the fs settings. > Did you use the filesystem's default settings rather than reinstall your > system with sensible settings? Yup. I use whatever was shipped with it. > If you said "yes" to all of the above, this is a filesystem "feature", > courtesy of (cr)Apple, and you're screwed. > > You can work around it by running "git pack-refs" every time you create > a branch or a tag though. Thanks for the tips. I'll be sure to use this. > -- > Andreas Ericsson andreas.erics...@op5.se > OP5 AB www.op5.se > Tel: +46 8-230225 Fax: +46 8-230231 > > Considering the successes of the wars on alcohol, poverty, drugs and > terror, I think we should give some serious thought to declaring war > on peace. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: git branch case insensitivity (Possible bug)
- Original Message - From: Andreas Ericsson Date: 1/9/2013 8:52 AM Are you using Mac OSX? Are you using the HFS+ filesystem shipped with it? Did you use the filesystem's default settings rather than reinstall your system with sensible settings? If you said "yes" to all of the above, this is a filesystem "feature", courtesy of (cr)Apple, and you're screwed. You can work around it by running "git pack-refs" every time you create a branch or a tag though. There are two popular default file systems that are case preserving, case insensitive. One is on Mac. One is on Windows. Since Git relies on file system behavior to store the equivalent of database entries like these refs, it cannot give a consistent user experience across platforms or even file systems within platforms. That sounds like a bug in Git to me. Perhaps pack-refs should be run automatically by any internal command that updates a ref to ensure a non-confusing, consistent user experience. Further, if refs are no longer entries on the disk, then this nasty namespacing issue goes away. User A: $ git branch render $ git push User B: $ git pull $ git branch render/myfeature render/myfeature can't be created, because Git assumes a filesystem structure. The render namespace is locked out forever. -Josh -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: git branch case insensitivity (Possible bug)
Am 09.01.2013 18:03, schrieb Alexander Gallego: > On Wed, Jan 9, 2013 at 10:52 AM, Andreas Ericsson wrote: >> [about case-insensitivity of HFS+ and branch names] >> If you said "yes" to all of the above, this is a filesystem "feature", >> courtesy of (cr)Apple, and you're screwed. >> >> You can work around it by running "git pack-refs" every time you create >> a branch or a tag though. > > Thanks for the tips. I'll be sure to use this. Naah... that's unworkable. I'm sure the Andreas meant the suggestion tongue-in-cheek. The important part of his reply is "you're screwed". -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
