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 0/2] git-merge-file: do not add LF at EOF while applying unrelated change
Date: Sat, 28 Jun 2014 22:37:21 +0300 [thread overview]
Message-ID: <1403984243-22717-1-git-send-email-max@max630.net> (raw)
Hi.
I have noticed that cherry-pick adds trailing newlines when it is not
expected to - the change does not contain its addition. Here is the fix
for it.
The fix is quite debugging-driven, without detailed analysis of how
exactly this "add_nl" parameter works in all cases. But it passes all
tests. I have added some more where I felt there were not enough.
Also I have noticed that some tests in the t6023, which related to the
behavior contain a mistake which makes them meaningless. I have fixed it
and marked the tests as expected failure, because they are failing after
that. Hopely they will be fixed some day.
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 | 72 ++++++++++++++++++++++++++++++++++++++++++++++++---
xdiff/xmerge.c | 4 +--
2 files changed, 71 insertions(+), 5 deletions(-)
--
2.0.0.526.g5318336
next reply other threads:[~2014-06-28 19:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-28 19:37 Max Kirillov [this message]
2014-06-28 19:37 ` [PATCH 1/2] t6023-merge-file.sh: fix and mark as broken invalid tests Max Kirillov
2014-06-28 19:37 ` [PATCH 2/2] git-merge-file: do not add LF at EOF while applying unrelated change 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=1403984243-22717-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).