From: Max Kirillov <max@max630.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Bert Wesarg <bert.wesarg@googlemail.com>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2 2/2] git-merge-file: do not add LF at EOF while applying unrelated change
Date: Wed, 2 Jul 2014 07:44:28 +0300 [thread overview]
Message-ID: <20140702044427.GA7325@wheezy.local> (raw)
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
next prev parent reply other threads:[~2014-07-02 4:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-28 22:04 [PATCH v2 0/2] git-merge-file: do not add LF at EOF while applying unrelated change Max Kirillov
2014-06-28 22:04 ` [PATCH v2 1/2] t6023-merge-file.sh: fix and mark as broken invalid tests Max Kirillov
2014-06-28 22:04 ` [PATCH v2 2/2] git-merge-file: do not add LF at EOF while applying unrelated change Max Kirillov
2014-06-30 14:55 ` Johannes Schindelin
2014-07-01 17:01 ` Junio C Hamano
2014-07-02 4:44 ` Max Kirillov [this message]
2014-07-02 14:08 ` Johannes Schindelin
2014-07-03 4:31 ` Max Kirillov
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140702044427.GA7325@wheezy.local \
--to=max@max630.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
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 NNTP newsgroup(s).