From: Torsten Bögershausen <tbo...@web.de>
unified auto CRLF handling, V2
1/3 is 7/10 of the old 10/10 series
2/3 and
3/3 is a replacement for tb/convert-peek-in-index:
Better commit message, added test case
All in all we are getting closer.
Most of the patches had been send & reviewed earlier,
but a critical review won't hurt.
Torsten Bögershausen (3):
convert: unify the "auto" handling of CRLF
read-cache: factor out get_sha1_from_index() helper
Correct ce_compare_data() in a middle of a merge
Documentation/config.txt | 12 +++----
Documentation/gitattributes.txt | 15 +++++----
builtin/apply.c | 3 +-
builtin/blame.c | 2 +-
cache.h | 4 +++
combine-diff.c | 3 +-
convert.c | 65 +++++++++++++++++++++++-------------
convert.h | 18 +++++++---
diff.c | 3 +-
dir.c | 2 +-
read-cache.c | 33 +++++++++++-------
sha1_file.c | 12 +++++--
t/t0025-crlf-auto.sh | 4 +--
t/t0027-auto-crlf.sh | 32 +++++++++---------
t/t6038-merge-text-auto.sh | 74 ++++++++++++++++++++++++-----------------
15 files changed, 172 insertions(+), 110 deletions(-)
--
2.0.0.rc1.6318.g0c2c796
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
