{"thread":{"id":"24921","subject":"diff.noprefix breaks rebase","startedAt":"2010-08-31T12:53:05Z","lastAt":"2010-08-31T12:53:05Z","messageCount":1,"participants":["Tarmo Tänav"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"149414","messageId":"1283259185.24737.12.camel@localhost","threadId":"24921","inReplyTo":null,"subject":"diff.noprefix breaks rebase","fromName":"Tarmo Tänav","fromEmail":"tarmo@itech.ee","sentAt":"2010-08-31T12:53:05Z","receivedAt":"2010-08-31T12:53:05Z","isPatch":false,"sender":{"key":"tarmo@itech.ee","avatar":null},"body":"Hi,\n\nIt seems that diff.noprefix causes rebase to misplace files that exist\nin paths that have names similiar to the git diff default prefixes. So a\ncommit that adds /db/somefile will after a rebase place the file\ninto /somefile. \n\nExample test-case below:\n\nmkdir test\ncd test\ngit init\ntouch x\ngit add x\ngit commit -m x\ntouch z\ngit add z\ngit commit -m z\nmkdir db\ntouch db/y\ngit add db\ngit commit -m db\ngit config diff.noprefix true\ngit rebase --onto master^^ master^ master\nls -R\n.:\nx  y\n\nexpecting to see:\nls -R\n.:\ndb  x\n\n./db:\ny\n\n\nRegards,\nTarmo\n"}]}