From: "Gondek, Andreas" <Andreas.Gondek@dwpbank.de>
To: Michael J Gruber <git@drmicha.warpmail.net>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: AW: Git merge driver / attributes bug in 2.3.1?
Date: Fri, 6 Mar 2015 13:31:52 +0000 [thread overview]
Message-ID: <D8780C527EB1E642B3150E6D705B46D448E8058B@DWPWHMS531.dwpbank.local> (raw)
In-Reply-To: <54F98EBE.8080903@drmicha.warpmail.net>
[-- Attachment #1: Type: text/plain, Size: 1641 bytes --]
The archive contains my test repository, the merge driver and the .gitconfig of the user. We don't have a global .gitconfig.
Mit freundlichen Grüßen
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.)
-----Ursprüngliche Nachricht-----
Von: Michael J Gruber [mailto:git@drmicha.warpmail.net]
Gesendet: Freitag, 6. März 2015 12:26
An: Gondek, Andreas; git@vger.kernel.org
Betreff: Re: Git merge driver / attributes bug in 2.3.1?
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
[-- Attachment #2: testRepo.zip --]
[-- Type: application/x-zip-compressed, Size: 30277 bytes --]
next prev parent reply other threads:[~2015-03-06 13:32 UTC|newest]
Thread overview: 9+ 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
2015-03-06 13:31 ` Gondek, Andreas [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2015-03-06 13:40 AW: " Andreas
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=D8780C527EB1E642B3150E6D705B46D448E8058B@DWPWHMS531.dwpbank.local \
--to=andreas.gondek@dwpbank.de \
--cc=git@drmicha.warpmail.net \
--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).