Skip to content

Apply blanks at EOF

Björn Gustavsson git 3 versions New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest5 patches 0 repliesNew
  2. v35 patches 1 replySuperseded
  3. v24 patches 2 repliesSuperseded

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5apply: Don't unnecessarily update line lengths in the preimagebuiltin-apply.c+6 -110 replies
2/5apply: Remove the quick rejection testbuiltin-apply.c t/t4104-apply-boundary.sh+16 -50 replies
3/5apply: Allow blank context lines to match beyond EOFbuiltin-apply.c+138 -300 replies
4/5t4124: Add additional tests of --whitespace=fixt/t4124-apply-ws-rule.sh+170 -00 replies
5/5t3417: Add test cases for "rebase --whitespace=fix"t/t3417-rebase-whitespace-fix.sh+126 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [PATCH v4 0/5] Apply blanks at EOF

Another re-roll to fix --ignore-space-change in combination with --whitespace=fix when the patch has CR-LF line endings.

Björn Gustavsson (5):
apply: Don't unnecessarily update line lengths in the preimage
apply: Remove the quick rejection test
No change.

apply: Allow blank context lines to match beyond EOF
The fix and an updated commit message.

t4124: Add additional tests of --whitespace=fix
One test case split into two and two new test cases.

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

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