79531663

Date: 2025-03-24 16:57:31
Score: 1
Natty:
Report link

I find it rather funny (not) that there is such an incompatibility / unfriendly behaviour of git am when working with CRLF files:

foo.cpp: C source, ASCII text, with CRLF line terminators

I'd have expected to be able to do a plain format-patch, immediately followed by a corresponding plain git am, without any deviation shenanigans occurring. That would have been proper usability.

However, doing so fails both in another repository and in the original repository itself (when sitting at the correct pre-commit revision) - with both repos having identical .git/config settings.

patch -p[X] < foo.patch

however does work (but of course one will be missing out on the full cooked toolchain-provided commit handling then).

git am --keep-cr (thanks!) appears to work, but with

warning: quoted CRLF detected

message.

git-svn repository here as well, so maybe that's the complication.

Reasons:
  • Blacklisted phrase (0.5): thanks
  • Long answer (-0.5):
  • No code block (0.5):
  • Low reputation (0.5):
Posted by: LinuxDev