2 messages, 2 authors, 2016-10-18 · open the first message on its own page
From: Junio C Hamano <hidden>
Date: 2016-10-17 17:51:57
Johannes Schindelin [off-list ref] writes:
I would vote for: 4. We keep letting Git read in the *current* version of .gitattributes *before* the merge, and apply those attributes while performing the merge.
Even though this needs a major surgery to the way the attr subsystem reads from these files, I think it is conceptually the cleanest.
From: Johannes Schindelin <hidden>
Date: 2016-10-18 12:39:29
Hi Junio, On Mon, 17 Oct 2016, Junio C Hamano wrote:
Johannes Schindelin [off-list ref] writes:quoted
I would vote for: 4. We keep letting Git read in the *current* version of .gitattributes *before* the merge, and apply those attributes while performing the merge.Even though this needs a major surgery to the way the attr subsystem reads from these files, I think it is conceptually the cleanest.
To the contrary. As far as I can see, when calling `git merge`, Git currently *does* read .gitattributes from the file, and if that fails, falls back to reading that file from the index. In other words, option 4. is the current behavior no change required. Ciao, Dscho