DORMANTno replies

[RFC/PATCH 0/3] More fool-proof "git rebase --whitespace=fix"

From: Björn Gustavsson <hidden>
Date: 2016-06-15 22:48:17

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help