From: Max Kirillov <max@max630.net>
To: Bert Wesarg <bert.wesarg@googlemail.com>,
Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, Max Kirillov <max@max630.net>
Subject: [PATCH v2 0/2] git-merge-file: do not add LF at EOF while applying unrelated change
Date: Sun, 29 Jun 2014 01:04:44 +0300 [thread overview]
Message-ID: <1403993086-15625-1-git-send-email-max@max630.net> (raw)
I realized the case when the newline adding can be needed.
The version 2 have this case (union-merge of changes at EOF without LF)
fixed, with adding corresponding tests.
Max Kirillov (2):
t6023-merge-file.sh: fix and mark as broken invalid tests
git-merge-file: do not add LF at EOF while applying unrelated change
t/t6023-merge-file.sh | 91 +++++++++++++++++++++++++++++++++++++++++++++++++--
xdiff/xmerge.c | 4 +--
2 files changed, 90 insertions(+), 5 deletions(-)
--
2.0.0.526.g5318336
next reply other threads:[~2014-06-28 22:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-28 22:04 Max Kirillov [this message]
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
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=1403993086-15625-1-git-send-email-max@max630.net \
--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).