{"thread":{"id":"24874","subject":"RFH: is the current file available to a custom merge driver?","startedAt":"2010-08-26T22:13:03Z","lastAt":"2010-08-26T22:13:03Z","messageCount":1,"participants":["Eric Raible"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"149089","messageId":"AANLkTi=mrO_6mv6vacE2sUq=fiJnzb-yS7yT3gHvO61H@mail.gmail.com","threadId":"24874","inReplyTo":null,"subject":"RFH: is the current file available to a custom merge driver?","fromName":"Eric Raible","fromEmail":"raible@gmail.com","sentAt":"2010-08-26T22:13:03Z","receivedAt":"2010-08-26T22:13:03Z","isPatch":false,"sender":{"key":"raible@gmail.com","avatar":null},"body":"In writing a custom merge driver to support $dayjob\nrequirements I've failed to find a simple way of getting\nthe current file name that the driver is supposed to\nbe merging.\n\nI of course have the \"ancestor\", \"ours\", and \"theirs\"\ntemporary files, but for Ui purposes I'd like to know\nthe filename as well.\n\nAs a workaround, I'm grepping for the git-hash-object\nof %A (aka \"ours) from the output of \"git ls-tree -r HEAD\".\n\nI've examined the environment, and saw nothing relevant.\n\"git-ls-files -u\" isn't useful, since the items aren't\nunmerged yet.\n\nCan anyone offer hints/help/tips?\n\nThanks - Eric\n\ngit version 1.7.0.2.msysgit.0\n"}]}