Package: git Version: 1:2.11.0-3 Severity: normal Dear Maintainer,
I merge using -X renormalize option but git 2.11 has a fatal bug. The merge abruptly fails with (no way to bypass): fatal: LF would be replaced by CRLF in "xxx.bat" The git version from jessie - 2.1.4 does not have this issue, on the exact same repo, and the merge succeeds with no problem. The .gitattributes in both branches involved contains * text=auto *.bat text eol=crlf This could be related to the patches done on renormalize in git: https://github.com/git/git/commit/7479ca4b44193acee43c480ae37e0bec98316f7a https://github.com/git/git/search?q=renormalize&type=Commits&utf8=%E2%9C%93 I don't know if they fix this issue for certain but I don't think 2.11.0 in stretch has received all those. >From what I was able to find, this probably got broken since 2.10: https://github.com/git/git/blob/v2.10.0/Documentation/RelNotes/2.10.0.txt -- System Information: Debian Release: 9.0 APT prefers stable APT policy: (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 4.9.0-3-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8), LANGUAGE=en_US.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages git depends on: ii dpkg 1.18.24 ii git-man 1:2.11.0-3 ii libc6 2.24-11 ii libcurl3-gnutls 7.52.1-5 ii liberror-perl 0.17024-1 ii libexpat1 2.2.0-2 ii libpcre3 2:8.39-3 ii perl 5.24.1-3 ii zlib1g 1:1.2.8.dfsg-5 Versions of packages git recommends: ii less 481-2.1 ii openssh-client [ssh-client] 1:7.4p1-10 ii patch 2.7.5-1+b2 ii rsync 3.1.2-1 Versions of packages git suggests: ii gettext-base 0.19.8.1-2 pn git-arch <none> pn git-cvs <none> pn git-daemon-run | git-daemon-sysvinit <none> pn git-doc <none> pn git-el <none> pn git-email <none> ii git-gui 1:2.11.0-3 pn git-mediawiki <none> ii git-svn 1:2.11.0-3 ii gitk 1:2.11.0-3 pn gitweb <none> -- no debconf information
