git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Git merge driver / attributes bug in 2.3.1?

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 5, 2015, 18:55 UTC
Message-ID
<xmqqa8zr46kv.fsf@gitster.dls.corp.google.com>
In-Reply-To
<D8780C527EB1E642B3150E6D705B46D448E7E48C@DWPWHMS531.dwpbank.local>
"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-<.

Previous: Gondek, AndreasNext: Michael J Gruber
Message 2 of 8 in “Git merge driver / attributes bug in 2.3.1?”
  1. Gondek, AndreasMar 5, 2015
  2. Junio C HamanoMar 5, 2015
  3. Michael J GruberMar 6, 2015
  4. AW: Git merge driver / attributes bug in 2.3.1?Gondek, Andreas, Mar 6, 2015
  5. Michael J GruberMar 6, 2015
  6. Junio C HamanoMar 6, 2015
  7. AW: Git merge driver / attributes bug in 2.3.1?Gondek, Andreas, Mar 9, 2015
  8. Michael J GruberMar 9, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.