Skip to content

format-patch updates

Björn Gustavsson git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3format-patch: Make implementation and documentation agreeDocumentation/diff-options.txt builtin-log.c t/t4014-format-patch.sh+41 -80 replies
1/3apply: Allow blank context lines to match beyond EOFbuiltin-apply.c+108 -192 replies
2/3format-patch documentation: Remove diff options that are not usefulDocumentation/diff-options.txt+12 -30 replies
2/3t4124: Add additional tests of --whitespace=fixt/t4124-apply-ws-rule.sh+12 -00 replies
3/3format-patch documentation: Fix formattingDocumentation/diff-options.txt Documentation/git-format-patch.txt+35 -351 reply
3/3t3417: 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 v1 yet.

Read the v1 thread

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

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