{"thread":{"id":"33824","subject":"Trouble with case insensitive filesystem","startedAt":"2013-05-15T08:40:48Z","lastAt":"2013-05-16T03:15:43Z","messageCount":3,"participants":["Luc Bourhis","Johannes Sixt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"217420","messageId":"F0A0C92F-6D85-463E-9CB5-B9060BDA196B@mac.com","threadId":"33824","inReplyTo":null,"subject":"Trouble with case insensitive filesystem","fromName":"Luc Bourhis","fromEmail":"luc_j_bourhis@mac.com","sentAt":"2013-05-15T08:40:48Z","receivedAt":"2013-05-15T08:40:48Z","isPatch":false,"sender":{"key":"luc_j_bourhis@mac.com","avatar":null},"body":"Hi,\n\nI work on a case insensitive filesystem and I have core.ignorecase set to true. \nI have a series of troublesome commits and here is what git cat-file -p shows me:\n\n...\n100644 blob 99...\tfourCircles.py\n100644 blob 97...\tfourcircles.py\n...\n\nThe content of those slightly differ:\n\n--- a/99...\n+++ b/97...\n-__version__='$Header: .../fourCircles.py, ...$'\n+__version__='$Header: .../fourcircle.py, ...$'\n \nAs you can guess this git repo started its life with CVS (it was converted with git cvsimport). \nSo I thought it was a job for git filter-branch, specifically I propose to do:\ngit filter-branch --index-filter 'git rm --cached --ignore-unmatch .../fourCircles.py' <commit>\n\nHowever because of those two blobs, I have:\n\n~> git status\n#\tmodified:   .../fourCircles.py\n\nand git filter-branch therefore refuses to run. I tried to use checkout, reset, \neven to commit that fluke of a change but whatever I do, that file is still marked \nas modified. \n\nI am sure I am missing a tiny detail that would get me\nout of those dire straights but it has eluded me so far.\n\nI run git 1.8.2.2 on MacOS 10.7.5 (installed with MacPorts if that matters).\n\nBest wishes,\n\nLuc J. Bourhis\n"},{"id":"217435","messageId":"51938E51.5060900@viscovery.net","threadId":"33824","inReplyTo":"F0A0C92F-6D85-463E-9CB5-B9060BDA196B@mac.com","subject":"Re: Trouble with case insensitive filesystem","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2013-05-15T13:32:01Z","receivedAt":"2013-05-15T13:32:01Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 5/15/2013 10:40, schrieb Luc Bourhis:\n> I work on a case insensitive filesystem and I have core.ignorecase set to true. \n> ...\n> So I thought it was a job for git filter-branch, ...\n> \n> However because of those two blobs, I have:\n> \n> ~> git status\n> #\tmodified:   .../fourCircles.py\n> \n> and git filter-branch therefore refuses to run.\n\nMake a commit that has neither file, run git filter-branch, then throw\naway the commit with git reset --hard HEAD~.\n\n-- Hannes\n"},{"id":"217493","messageId":"075E55AB-24A4-495E-BC40-92745DE7F4AE@mac.com","threadId":"33824","inReplyTo":"51938E51.5060900@viscovery.net","subject":"Re: Trouble with case insensitive filesystem","fromName":"Luc Bourhis","fromEmail":"luc_j_bourhis@mac.com","sentAt":"2013-05-16T03:15:43Z","receivedAt":"2013-05-16T03:15:43Z","isPatch":false,"sender":{"key":"luc_j_bourhis@mac.com","avatar":null},"body":"\nOn 15 May 2013, at 15:32, Johannes Sixt wrote:\n\n> Am 5/15/2013 10:40, schrieb Luc Bourhis:\n>> I work on a case insensitive filesystem and I have core.ignorecase set to true. \n>> ...\n>> So I thought it was a job for git filter-branch, ...\n>> \n>> However because of those two blobs, I have:\n>> \n>> ~> git status\n>> #\tmodified:   .../fourCircles.py\n>> \n>> and git filter-branch therefore refuses to run.\n> \n> Make a commit that has neither file, run git filter-branch, then throw\n> away the commit with git reset --hard HEAD~.\n\nThat did not work, i.e. fourCircles remained \"unmodified\". Eventually, I managed by successively removing the file with \"C\" and then the file with \"c\". Then filter-branch, and then reset --hard as you suggested. Then of course, all the sha's have changed and git cvsimport can't be used for incremental updates anymore, which I knew would happen, obviously.\n\nThanks,\n\nLuc J. Bourhis\n "}]}