From: Torsten Bögershausen <tbo...@web.de> Split of the old 10/10 series. This is the update of t6038, which is needed to motivate the patch `convert: ce_compare_data() checks for a sha1 of a path` on top of `convert: unify the "auto" handling of CRLF`
When files with different eols are merged with merge.renormalize = true, it is important to look at the right blob to determine if the crlf came from the blob or are a result of a coversion. This is a little bit of a hen-and-egg problem: The problem comes up after the "unified auto handling". In theory, it should have been since before: get_sha1_from_index() says: * We might be in the middle of a merge, in which * case we would read stage #2 (ours). This seams wrong, as in the merge we sometimes need to look at "theirs". (But I haven't managed to construct a TC) t6038-merge-text-auto.sh Torsten Bögershausen (1): t6038: different eol for "Merge addition of text=auto" t/t6038-merge-text-auto.sh | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 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
