From: "Gondek, Andreas" <Andreas.Gondek@dwpbank.de>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Git merge driver / attributes bug in 2.3.1?
Date: Thu, 5 Mar 2015 13:30:40 +0000 [thread overview]
Message-ID: <D8780C527EB1E642B3150E6D705B46D448E7E48C@DWPWHMS531.dwpbank.local> (raw)
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.)
next reply other threads:[~2015-03-05 13:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-05 13:30 Gondek, Andreas [this message]
2015-03-05 18:55 ` Git merge driver / attributes bug in 2.3.1? Junio C Hamano
2015-03-06 11:25 ` Michael J Gruber
2015-03-06 13:31 ` AW: " Gondek, Andreas
2015-03-06 14:12 ` Michael J Gruber
2015-03-06 21:30 ` Junio C Hamano
2015-03-09 9:02 ` AW: " Gondek, Andreas
2015-03-09 9:35 ` Michael J Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=D8780C527EB1E642B3150E6D705B46D448E7E48C@DWPWHMS531.dwpbank.local \
--to=andreas.gondek@dwpbank.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).