From: Junio C Hamano <gitster@pobox.com>
To: "Gondek\, Andreas" <Andreas.Gondek@dwpbank.de>
Cc: "git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Git merge driver / attributes bug in 2.3.1?
Date: Thu, 05 Mar 2015 10:55:44 -0800 [thread overview]
Message-ID: <xmqqa8zr46kv.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <D8780C527EB1E642B3150E6D705B46D448E7E48C@DWPWHMS531.dwpbank.local> (Andreas Gondek's message of "Thu, 5 Mar 2015 13:30:40 +0000")
"Gondek, Andreas" <Andreas.Gondek@dwpbank.de> writes:
> 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.
Do you see the same with something slightly older, like say v2.2.0?
The only change that I can think of offhand that may be related is
6ea358f7 (ll-merge.c: refactor `read_merge_config()` to use
`git_config_string()`, 2014-08-13) that went into v2.2.0, but I
don't immediately see how that would be related X-<.
next prev parent reply other threads:[~2015-03-05 18:55 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 [this message]
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=xmqqa8zr46kv.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--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.
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).