diff options
author | Torsten Bögershausen <tboegi@web.de> | 2015-04-25 08:47:13 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-04-25 09:41:29 -0700 |
commit | 8eeab92f02f3d9382572f0a604535c2b134c6763 (patch) | |
tree | d440048f6c3da8fae7f0ce8dc08ee94d2a7ff689 /t/t7602-merge-octopus-many.sh | |
parent | t0027: support NATIVE_CRLF platforms (diff) | |
download | tgif-8eeab92f02f3d9382572f0a604535c2b134c6763.tar.xz |
t0027: Add repoMIX and LF_nul
"new safer autocrlf handling":
- Check if eols in a file are converted at commit, when the file has
CR (or CRLF) in the repo (technically speaking in the index).
- Add a test-file repoMIX with mixed line-endings.
- When converting LF->CRLF or CRLF->LF: check the warnings
checkout_files():
- Checking out CRLF_nul and checking for eol coversion does not
make much sense (CRLF will stay CRLF).
- Use the file LF_nul instead: It is handled a binary in "auto" modes,
and when declared as text the LF may be replaced with CRLF, depending
on the configuration.
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions