From: Paolo Bonzini <[email protected]>
The thread at http://thread.gmane.org/gmane.comp.version-control.git/257392
details problems when applying patches with "git am" in a repository with
CRLF line endings. In the example in the thread, the repository originated
from "git-svn" so it is not possible to use core.eol and friends on it.
Right now, the best option is to use "git am --keep-cr". However, when
a patch create new files, the patch application process will reject the
new file because it finds a "/dev/null\r" string instead of "/dev/null".
The problem is that SMTP transport is CRLF-unsafe; "git am --keep-cr" is
mostly working by chance and it would be very problematic to have a "git
am" workflow in a repository with mixed LF and CRLF line endings. It is
more robust to forgo readable patch files[1] and use the quoted-printable
transfer enconding. This series adds an option and configuration key
to git-send-email that lets it automatically produce quoted-printable
or base64 messages.
Paolo
[1] A useful oneliner to decode quoted-printable files is the following:
perl -pe 'use MIME::QuotedPrint; $_=MIME::QuotedPrint::decode($_);'
Paolo Bonzini (2):
git-send-email: delay creation of MIME headers
git-send-email: add --transfer-encoding option
Documentation/config.txt | 1 +
Documentation/git-send-email.txt | 10 +++
contrib/completion/git-completion.bash | 4 +
git-send-email.perl | 61 +++++++++++--
t/t9001-send-email.sh | 157 +++++++++++++++++++++++++++++++++
5 files changed, 227 insertions(+), 6 deletions(-)
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
