{"thread":{"id":"38727","subject":"AW: Git merge driver / attributes bug in 2.3.1?","startedAt":"2015-03-06T13:40:27Z","lastAt":"2015-03-06T13:40:27Z","messageCount":1,"participants":["andreas@gondek.de"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"257160","messageId":"201d303af6e888edf54fd610c7397caf@imap.euserv.de","threadId":"38727","inReplyTo":null,"subject":"AW: Git merge driver / attributes bug in 2.3.1?","fromName":"","fromEmail":"andreas@gondek.de","sentAt":"2015-03-06T13:40:27Z","receivedAt":"2015-03-06T13:40:27Z","isPatch":false,"sender":{"key":"andreas@gondek.de","avatar":null},"body":"The archive contains my test repository, the merge driver and the \n.gitconfig of the user. We don't have a global .gitconfig.\n\nThe merge was tried from master to test.\n\nGreetings\n\nAndreas Gondek\nApplications\n________________________________\n\nDeutsche WertpapierService Bank AG\nITTAS\nDerendorfer Allee 2\n40476 Düsseldorf\nTel.: +49 69 5099 9503\nFax: +49 69 5099 85 9503\nE-Mail: Andreas.Gondek@dwpbank.de\nhttp://www.dwpbank.de\n\nDeutsche WertpapierService Bank AG | Wildunger Straße 14 | 60487 \nFrankfurt am Main\nSitz der AG: Frankfurt am Main, HRB 56913 | USt.-ID: DE 813759005\nVorstand: Thomas Klanten, Dr. Christian Tonnesen\nAufsichtsrat: Wilfried Groos (Vors.)\n\n-----Ursprüngliche Nachricht-----\nVon: Michael J Gruber [mailto:git@drmicha.warpmail.net]\nGesendet: Freitag, 6. März 2015 12:26\nAn: Gondek, Andreas; git@vger.kernel.org\nBetreff: Re: Git merge driver / attributes bug in 2.3.1?\n\nGondek, Andreas venit, vidit, dixit 05.03.2015 14:30:\n> Hello,\n>\n> after upgrading the Git installation on one of our development \n> servers\n> from 1.9.0-rc3 to 2.3.1 we are experiencing strange behavior of merge\n> drivers.\n>\n> A merge driver registered as \"* merge=<name_of_merge_driver>\" in the\n> .gitattributes is now executed even if there isn't any merge \n> conflict.\n> This only happens for files that are part of the merge.\n>\n> This is reproducible in test repositories.\n\nCan you share a minimal test repo?\n\nI've been trying to reproduce this, unsuccessfully so far.\n\nI guess it depends on how exactly those files are \"part of the merge\", \nand how the merge driver is set up. (I've tried with and without \nrecursive.)\n\nMichael\n"}]}