Teach "diff" to ignore only CR at EOL
Get series with b4
b4 am [email protected]Versions newest first
- v2 Latest2 patches 9 repliesIn review
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | xdiff: reassign xpparm_t.flags bitsdiff.c xdiff/ | +15 | 2 replies | |
| 2/2 | diff: --ignore-cr-at-eolDocumentation/ Documentation/ diff.c +4 more | +77 | 4 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [PATCH v2 0/2] Teach "diff" to ignore only CR at EOL
This time with doc updates and tests. The previous one is at
https://public-inbox.org/git/[email protected]
A change that is supposed to only change the end-of-line convention between LF <-> CRLF and nothing else can be verified with "diff -b" or "diff --ignore-space-at-eol" in practice, but these hide changes in whitespaces other than the carriage return at the end of the lines.
These two patches introduce a new --ignore-cr-at-eol option so that only CR at eol and no other whitespace changes are ignored while making a comparison, to allow a stricter validation.
I am not sure how much practical value the new option has. The preliminary clean-up patch to shuffle the bis assignment for flags does have values, though ;-).
Junio C Hamano (2):
xdiff: reassign xpparm_t.flags bits
diff: --ignore-cr-at-eol
Documentation/diff-options.txt | 3 +++ Documentation/merge-strategies.txt | 5 +++-- diff.c | 6 +++--- merge-recursive.c | 2 ++ t/t4015-diff-whitespace.sh | 28 ++++++++++++++++++++++++++++ xdiff/xdiff.h | 26 ++++++++++++++++---------- xdiff/xutils.c | 38 ++++++++++++++++++++++++++++++++++++-- 7 files changed, 91 insertions(+), 17 deletions(-)
Signature · 1 line
2.15.0-263-g47cc852023