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

Re: [PATCH v2 2/2] git-merge-file: do not add LF at EOF while applying unrelated change

From
Max Kirillov <max@max630.net>
Date
Jul 2, 2014, 04:44 UTC
Message-ID
<20140702044427.GA7325@wheezy.local>
In-Reply-To
<alpine.DEB.1.00.1406301650430.14982@s15462909.onlinehome-server.info>
On Mon, Jun 30, 2014 at 04:55:10PM +0200, Johannes Schindelin wrote:
> I just wish the tests were a little easier to understand...
What could be improved with them?
> Having said that, here is my ACK for the current revision
> of the patch series
Thanks.

By the way, for "\r\n" eol it did even worse, adding just "\n". And I guess it still adds just "\n" for union merge. Should file merge consider the core.eol? I think it should, and for the conflict markers also, it looks ugly when whole file has "\r\n" but the conflict markers have "\n". But then git-merge-file could not be used outside of repository, I guess.

In general, I wish file merging (and diffing) were more tolerant of the line endings in input. Because in windows environment, when people have different core.autocrlf, it becomes quite frustrating to always get conflicts and changes.

-- 
Max
Previous: Junio C HamanoNext: Johannes Schindelin
Message 6 of 8 in “git-merge-file: do not add LF at EOF while applying unrelated change”
  1. 0/2 git-merge-file: do not add LF at EOF while applying unrelated changeMax Kirillov, Jun 28, 2014
  2. 1/2 t6023-merge-file.sh: fix and mark as broken invalid testsMax Kirillov, Jun 28, 2014
  3. 2/2 git-merge-file: do not add LF at EOF while applying unrelated changeMax Kirillov, Jun 28, 2014
  4. Johannes SchindelinJun 30, 2014
  5. Junio C HamanoJul 1, 2014
  6. Max KirillovJul 2, 2014
  7. Johannes SchindelinJul 2, 2014
  8. Max KirillovJul 3, 2014

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.