On Wed, Jan 9, 2013 at 10:52 AM, Andreas Ericsson <ae@xxxxxx> 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.ericsson@xxxxxx > 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 majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html