Skip to contentSkip to conversation

Apply blanks at EOF

PATCH Superseded Björn Gustavsson 2 participants 2 messages Jun 15, 2016

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover Apply blanks at EOF

Here is my third attempt.

Björn Gustavsson (5):
apply: Don't unnecessarily update line lengths in the preimage
As far as I understand, there was a completely unnecessary update of line lengths which I have got rid of.

apply: Remove the quick rejection test
Unchanged (except for a minor correction of the commit message).

apply: Allow blank context lines to match beyond EOF
Included Junio's suggested clean-up that eliminates the "limit" variable.

Now handling --ignore-space-change.

t4124: Add additional tests of --whitespace=fix
Added some more test cases and modified several tests to run "git apply" both with and without the --ignore-space-change option.

t3417: Add test cases for "rebase --whitespace=fix"
Unchanged.

 builtin-apply.c                  |  184 +++++++++++++++++++++++++++++---------
 t/t3417-rebase-whitespace-fix.sh |  126 ++++++++++++++++++++++++++
 t/t4104-apply-boundary.sh        |    9 ++
 t/t4124-apply-ws-rule.sh         |  119 ++++++++++++++++++++++++
 4 files changed, 397 insertions(+), 41 deletions(-)
 create mode 100755 t/t3417-rebase-whitespace-fix.sh