When you use 'git show <rev>:<file>' or 'git show :<stage>:<file>',
the objects are shows as they are in the object store, ignoring the
core.autocrlf configuration.
This series adds testcases which checks the stage files in a merge
conflict, and a fix for the problem.
Running all testcases before and after the fix reveals no regressions:
Before patch series:
./aggregate-results.sh test-results/t*-*
fixed 1
success 3374
failed 0
broken 2
total 3377
After patch series:
./aggregate-results.sh test-results/t*-*
fixed 1
success 3377
failed 0
broken 2
total 3380
rm -f -r 'trash directory' test-results
Marius Storm-Olsen (2):
Add testcases for verifying that staged files in a conflict are CRLF,
when core.autocrlf = true
Ensure that objects shown in a core.autocrlf = true repo have CRLF
EOLs
builtin-log.c | 19 ++++++++++++++-----
t/t6033-merge-crlf.sh | 18 ++++++++++++++++++
2 files changed, 32 insertions(+), 5 deletions(-)
--
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
