Git merge driver / attributes bug in 2.3.1?

From: Gondek, Andreas <andreas.gondek@dwpbank.de>
Date: Mar 5, 2015, 13:30 UTC
Message-ID: <D8780C527EB1E642B3150E6D705B46D448E7E48C@DWPWHMS531.dwpbank.local>

Hello,

after upgrading the Git installation on one of our development servers from 1.9.0-rc3 to 2.3.1 we are experiencing strange behavior of merge drivers.

A merge driver registered as "* merge=<name_of_merge_driver>" in the .gitattributes is now executed even if there isn't any merge conflict. This only happens for files that are part of the merge.

This is reproducible in test repositories.

Greetings

Andreas Gondek Applications ________________________________

Deutsche WertpapierService Bank AG
ITTAS
Derendorfer Allee 2
40476 Düsseldorf
Tel.: +49 69 5099 9503
Fax: +49 69 5099 85 9503
E-Mail: Andreas.Gondek@dwpbank.de
http://www.dwpbank.de

Deutsche WertpapierService Bank AG | Wildunger Straße 14 | 60487 Frankfurt am Main
Sitz der AG: Frankfurt am Main, HRB 56913 | USt.-ID: DE 813759005
Vorstand: Thomas Klanten, Dr. Christian Tonnesen
Aufsichtsrat: Wilfried Groos (Vors.)