{"thread":{"id":"23163","subject":"merge --no-ff on case insensitive when replacing case-changing file fails","startedAt":"2010-03-24T20:35:45Z","lastAt":"2010-03-24T20:35:45Z","messageCount":1,"participants":["François Beausoleil"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"137740","messageId":"BEA422D6-7434-447C-B0AE-A2BAC4E8E74B@bloomdigital.com","threadId":"23163","inReplyTo":null,"subject":"merge --no-ff on case insensitive when replacing case-changing file fails","fromName":"François Beausoleil","fromEmail":"francois.beausoleil@bloomdigital.com","sentAt":"2010-03-24T20:35:45Z","receivedAt":"2010-03-24T20:35:45Z","isPatch":false,"sender":{"key":"francois.beausoleil@bloomdigital.com","avatar":null},"body":"Hi!\n\nI don't yet have a reproduction recipe, but I think this is something that can be reproduced quickly. I'm on Mac OS X, using git 1.6.5.2.\n\nOn branch master I have a file named public/clippy/clippy.hx. I created a new branch from master, named ticket-726. On this branch, I replaced public/clippy with a new version, where clippy.hx was renamed to Clippy.hx (note capital C).\n\nMerging with --no-ff from ticket-726 onto master results in:\n\n$ git merge --no-ff ticket-726-clippy-from-page\nRemoving public/clippy.swf\nRemoving public/clippy/clippy.hx\nRemoving public/clippy/config.md\nRemoving public/clippy/library.swf\nRemoving public/clippy/swfmill\nMerge made by recursive.\nfatal: unable to read files to diff\n\nAfter this, the tree is unclean:\n\n$ git status\n# On branch master\n# Your branch is ahead of 'origin/master' by 9 commits.\n#\n# Changed but not updated:\n#   (use \"git add/rm <file>...\" to update what will be committed)\n#   (use \"git checkout -- <file>...\" to discard changes in working directory)\n#\n#       deleted:    public/clippy/Clippy.hx\n#\n\nIf I merge without the --no-ff flag, the merge succeeds:\n\n$ git merge ticket-726-clippy-from-page \nUpdating 8527f71..f9f070d\nFast forward\n...\n public/clippy/Clippy.hx                 |   45 +++++++++++++\n...\n public/clippy/clippy.hx                 |   28 --------\n...\n 21 files changed, 312 insertions(+), 79 deletions(-)\n...\n create mode 100644 public/clippy/Clippy.hx\n...\n delete mode 100644 public/clippy/clippy.hx\n...\n\nGoogle didn't turn up anything, except the reference in the source code where this error message is defined. There was also a prior report of this bug http://collab.sakaiproject.org/pipermail/sakai-ux/2010-March/001058.html but I couldn't read anything interesting from it.\n\nAs noted above, I'm on Mac OS X, which has is case insensitive, but case preserving.\n\nThanks!\nFrançois Beausoleil"}]}