From: Torsten Bögershausen <tboegi@xxxxxx>
Changes since v1:
- Re-order the patches
- t6038; use crlf on all platforms
This did actually not break anything (without old 7/10)
Adapt the commit message
- ce_compare_data():
Simplify the logic around free() in has_cr_in_index(),
Thanks Eric Sunshine
Break up the old 10/10 series about CLRF handling into smaller
series.
1/10..4/10 are now found in tb/core-eol-fix
This series includes 3 from the 10/10 series:
05/10 read-cache: factor out get_sha1_from_index() helper #now 1/3
10/10 Fix for ce_compare_data(), done right. #now 2/3
09/10 t6038; use crlf on all platforms #now 3/3
The most important patch is 2/3
The reminding 3 patches,
stream-and-early-out,
convert-unify-the-auto-handling-of-CRLF
more-safer-crlf-handling-with-text-attr
Need to be re-done, re-sorted and re-written, thanks for all the comments.
Torsten Bögershausen (3):
read-cache: factor out get_sha1_from_index() helper
convert: ce_compare_data() checks for a sha1 of a path
t6038; use crlf on all platforms
cache.h | 4 ++++
convert.c | 34 ++++++++++++++++++++++------------
convert.h | 23 +++++++++++++++++++----
read-cache.c | 33 +++++++++++++++++++++------------
sha1_file.c | 17 +++++++++++++----
t/t6038-merge-text-auto.sh | 37 +++++++++++--------------------------
6 files changed, 90 insertions(+), 58 deletions(-)
--
2.0.0.rc1.6318.g0c2c796
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html