From: "Björn Gustavsson" <bgustavsson@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/4] Apply blanks at EOF
Date: Wed, 24 Feb 2010 20:23:56 +0100 [thread overview]
Message-ID: <4B857CCC.7080809@gmail.com> (raw)
Here is my revised patch series.
Björn Gustavsson (4):
apply: Remove the quick rejection test
Now a separate commit for removing the quick reject and
clarifying another test, as well as a new test case.
apply: Allow blank context lines to match beyond EOF
At least one non-blank context line must now match before
the end of file. Rewrote my own changes in the beginning
of match_fragment() in a way that I think is clearer.
t4124: Add additional tests of --whitespace=fix
More test cases.
t3417: Add test cases for "rebase --whitespace=fix"
No changes.
builtin-apply.c | 146 ++++++++++++++++++++++++++++++-------
t/t3417-rebase-whitespace-fix.sh | 126 ++++++++++++++++++++++++++++++++
t/t4104-apply-boundary.sh | 9 +++
t/t4124-apply-ws-rule.sh | 85 ++++++++++++++++++++++
4 files changed, 338 insertions(+), 28 deletions(-)
create mode 100755 t/t3417-rebase-whitespace-fix.sh
reply other threads:[~2010-02-24 19:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4B857CCC.7080809@gmail.com \
--to=bgustavsson@gmail.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).