summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-22 01:47:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-22 01:47:44 (GMT)
commitbcd45e27d8790d8981d4c6734bc573363121efd3 (patch)
tree8693e3c78697d0ad72c976e798276c635bbc15cf /git-am.sh
parentf5d5ea525b6aa8b6435d4e8c92f5e797b4076fc0 (diff)
parentc2ca1d79dbd54b06a05e5d14a897699e59dc9f9f (diff)
downloadgit-bcd45e27d8790d8981d4c6734bc573363121efd3.zip
git-bcd45e27d8790d8981d4c6734bc573363121efd3.tar.gz
git-bcd45e27d8790d8981d4c6734bc573363121efd3.tar.bz2
Merge branch 'bc/mailsplit-cr-at-eol'
* bc/mailsplit-cr-at-eol: Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used builtin-mailinfo,builtin-mailsplit: use strbufs strbuf: add new function strbuf_getwholeline()
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index f719f6e..5396be2 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -211,7 +211,13 @@ check_patch_format () {
split_patches () {
case "$patch_format" in
mbox)
- git mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" ||
+ case "$rebasing" in
+ '')
+ keep_cr= ;;
+ ?*)
+ keep_cr=--keep-cr ;;
+ esac
+ git mailsplit -d"$prec" -o"$dotest" -b $keep_cr -- "$@" > "$dotest/last" ||
clean_abort
;;
stgit-series)