git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCHv2 0/4] Using git-mailsplit in mixed line ending environment

From
SHStefan-W. Hahn <stefan.hahn@s-hahn.de>
Date
Feb 11, 2010, 21:26 UTC
Message-ID
<1265923579-24900-1-git-send-email-stefan.hahn@s-hahn.de>
Hello,

I'm using git in environments 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.

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.

Second round: I changed 'mailsplit.keep-cr' to 'mailsplit.keepcr' as suggested by Jakub and a comment in the testcase.

Stefan-W. Hahn (4):
  git-mailsplit: Show parameter '--keep-cr' in usage and documentation
  git-mailsplit: add `mailsplit.keepcr` 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         |   74 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 107 insertions(+), 6 deletions(-)
 create mode 100644 t/t5101-mailinfo-dos.sh
Next: Stefan-W. Hahn
Message 1 of 13 in “[PATCHv2 0/4] Using git-mailsplit in mixed line ending environment”
  1. Stefan-W. HahnFeb 11, 2010
  2. 1/4 git-mailsplit: Show parameter '--keep-cr' in usage and documentationStefan-W. Hahn, Feb 11, 2010
  3. 2/4 git-mailsplit: add `mailsplit.keepcr` configuration variable.Stefan-W. Hahn, Feb 11, 2010
  4. Junio C HamanoFeb 11, 2010
  5. Stefan-W. HahnFeb 12, 2010
  6. Junio C HamanoFeb 12, 2010
  7. Junio C HamanoFeb 12, 2010
  8. Stefan-W. HahnFeb 12, 2010
  9. 3/4 git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit.Stefan-W. Hahn, Feb 11, 2010
  10. Junio C HamanoFeb 11, 2010
  11. Stefan-W. HahnFeb 12, 2010
  12. Junio C HamanoFeb 12, 2010
  13. 4/4 Adding test for `--keep-cr` for git-mailsplit and git-am.Stefan-W. Hahn, Feb 11, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.