From: "Björn Gustavsson" <bgustavsson@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [RFC/PATCH 0/3] More fool-proof "git rebase --whitespace=fix"
Date: Wed, 17 Feb 2010 08:02:51 +0100 [thread overview]
Message-ID: <4B7B949B.6020302@gmail.com> (raw)
This is the first step in making sure that "git rebase --whitespace=fix HEAD~<number>"
will never fail.
As suggested by Junio, the first step consists in changing "git apply whitespace=fix"
to be smarter about previously deleted blank lines at the end of the file.
I would be grateful for any feedback on the design decisions and the implementation.
Björn Gustavsson (3):
apply: Allow blank context lines to match beyond EOF
t4124: Add additional tests of --whitespace=fix
t3417: Add test cases for "rebase --whitespace=fix"
builtin-apply.c | 127 ++++++++++++++++++++++++++++++++------
t/t3417-rebase-whitespace-fix.sh | 126 +++++++++++++++++++++++++++++++++++++
t/t4124-apply-ws-rule.sh | 12 ++++
3 files changed, 246 insertions(+), 19 deletions(-)
create mode 100755 t/t3417-rebase-whitespace-fix.sh
reply other threads:[~2010-02-17 7:03 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=4B7B949B.6020302@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).