git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Stefan-W. Hahn" <stefan.hahn@s-hahn.de>
To: git@vger.kernel.org
Cc: "Stefan-W. Hahn" <stefan.hahn@s-hahn.de>
Subject: [PATCHv2 0/4] Using git-mailsplit in mixed line ending environment
Date: Thu, 11 Feb 2010 22:26:15 +0100	[thread overview]
Message-ID: <1265923579-24900-1-git-send-email-stefan.hahn@s-hahn.de> (raw)

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

             reply	other threads:[~2010-02-11 21:27 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-11 21:26 Stefan-W. Hahn [this message]
2010-02-11 21:26 ` [PATCH 1/4] git-mailsplit: Show parameter '--keep-cr' in usage and documentation Stefan-W. Hahn
2010-02-11 21:26 ` [PATCH 2/4] git-mailsplit: add `mailsplit.keepcr` configuration variable Stefan-W. Hahn
2010-02-11 23:21   ` Junio C Hamano
2010-02-12 21:03     ` Stefan-W. Hahn
2010-02-12 21:49       ` Junio C Hamano
2010-02-12 22:00         ` Junio C Hamano
2010-02-12 22:04         ` Stefan-W. Hahn
2010-02-11 21:26 ` [PATCH 3/4] git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit Stefan-W. Hahn
2010-02-11 23:21   ` Junio C Hamano
2010-02-12 21:05     ` Stefan-W. Hahn
2010-02-12 21:54       ` Junio C Hamano
2010-02-11 21:26 ` [PATCH 4/4] Adding test for `--keep-cr` for git-mailsplit and git-am Stefan-W. Hahn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1265923579-24900-1-git-send-email-stefan.hahn@s-hahn.de \
    --to=stefan.hahn@s-hahn.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).