From: Torsten Bögershausen <tboegi@xxxxxx>
Changes since v8:
As discussed earlier, 1..4 should be broken out into
tb/autocrlf-fix or so.
1..4 are not part of this series any more.
The old 10/10 is now 6/6.
It is replaced by "ce_compare_data() checks for a sha1 of a path"
It now checks for "What would git add change in the index",
and not "is the working tree clean after checkout" -
thats how it should be.
Basically an old limititation of "has_crlf_in_index()" has been found and
fixed.
The commit message may need some tweaking, and
even the implementation, so feedback is welcome.
Beside that, I haven't run the tests under Windows yet.
Torsten Bögershausen (6):
read-cache: factor out get_sha1_from_index() helper
convert.c: stream and early out
convert: unify the "auto" handling of CRLF
convert.c: more safer crlf handling with text attribute
t6038; use crlf on all platforms
convert: ce_compare_data() checks for a sha1 of a path
Documentation/config.txt | 14 +-
Documentation/gitattributes.txt | 24 ++-
cache.h | 4 +
convert.c | 362 +++++++++++++++++++++++++++-------------
convert.h | 26 ++-
read-cache.c | 33 ++--
sha1_file.c | 17 +-
t/t0025-crlf-auto.sh | 12 +-
t/t0027-auto-crlf.sh | 98 +++++------
t/t6038-merge-text-auto.sh | 60 +++----
10 files changed, 407 insertions(+), 243 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