threads / rfc / 22617

RFC patch, 4 partsUsing git-mailsplit in mixed line ending environment

Subject: [PATCH/RFC 0/4] Using git-mailsplit in mixed line ending environment

## tl;dr

One message between Feb 11, 2010 and Feb 11, 2010. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Stefan-W. Hahn· Feb 11, 2010, 18:13 UTC · lore
Hello,

I'm using git in an environment with files having dos or unix line ending. I apply patches using 'git format-patch ... | git am ...'. A change in git-mailsplit in commit c2ca1d79 introduced a change in the default behaviour of git-mailsplit when splitting mbox patches. It makes dos line endings to unix line endings. With this behaviour it is impossible to apply patches, because there is no possibility to forward '--keep-cr' through git-am to git-mailsplit.

The following patches introduce the '--kepp-cr' parameter to git-am an an additional possibility to set '--keep-cr' via configuration for git-mailsplit. Also I added missing description for '--keep-cr' of git-mailsplit.

Stefan
Stefan-W. Hahn (4):
  git-mailsplit: Show parameter '--keep-cr' in usage and documentation
  git-mailsplit: add `mailsplit.keep-cr` configuration variable.
  git-am: Add command line parameter `--keep-cr` passing it to
    git-mailsplit.
  Adding test for `--keep-cr` for git-mailsplit and git-am.
 Documentation/config.txt        |    4 ++
 Documentation/git-mailsplit.txt |    5 ++-
 builtin-mailsplit.c             |   12 ++++++-
 git-am.sh                       |   18 +++++++--
 t/t5101-mailinfo-dos.sh         |   75 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 108 insertions(+), 6 deletions(-)
 create mode 100644 t/t5101-mailinfo-dos.sh

← back to recent threads