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

Re: Git merge driver / attributes bug in 2.3.1?

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Mar 6, 2015, 11:25 UTC
Message-ID
<54F98EBE.8080903@drmicha.warpmail.net>
In-Reply-To
<D8780C527EB1E642B3150E6D705B46D448E7E48C@DWPWHMS531.dwpbank.local>
Gondek, Andreas venit, vidit, dixit 05.03.2015 14:30:
Show 11 quoted lines
> 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
Previous: Junio C HamanoNext: Gondek, Andreas
Message 3 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.