* [RFC/PATCH 0/3] More fool-proof "git rebase --whitespace=fix"
@ 2010-02-17 7:02 Björn Gustavsson
0 siblings, 0 replies; only message in thread
From: Björn Gustavsson @ 2010-02-17 7:02 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-02-17 7:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-17 7:02 [RFC/PATCH 0/3] More fool-proof "git rebase --whitespace=fix" Björn Gustavsson
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).