From: Michael J Gruber <git@drmicha.warpmail.net>
To: "Gondek, Andreas" <Andreas.Gondek@dwpbank.de>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Git merge driver / attributes bug in 2.3.1?
Date: Fri, 06 Mar 2015 12:25:50 +0100 [thread overview]
Message-ID: <54F98EBE.8080903@drmicha.warpmail.net> (raw)
In-Reply-To: <D8780C527EB1E642B3150E6D705B46D448E7E48C@DWPWHMS531.dwpbank.local>
Gondek, Andreas venit, vidit, dixit 05.03.2015 14:30:
> 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.
Can you share a minimal test repo?
I've been trying to reproduce this, unsuccessfully so far.
I guess it depends on how exactly those files are "part of the merge",
and how the merge driver is set up. (I've tried with and without recursive.)
Michael
next prev parent reply other threads:[~2015-03-06 11:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-05 13:30 Git merge driver / attributes bug in 2.3.1? Gondek, Andreas
2015-03-05 18:55 ` Junio C Hamano
2015-03-06 11:25 ` Michael J Gruber [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54F98EBE.8080903@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=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.
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 NNTP newsgroup(s).