Hi, Jason King (cc'd) reported that a patch for a file with CRLF lineendings fails to apply, even if generated and applied in the same repo. doener@atjola:x $ git init doener@atjola:x (master) $ for x in $(seq 10); do echo -e "$x\r" >> foo; done doener@atjola:x (master) $ vim foo doener@atjola:x (master) $ git add foo; git commit -m init [master (root-commit) b59b963] init 1 files changed, 10 insertions(+), 0 deletions(-) create mode 100644 foo doener@atjola:x (master) $ sed -ie s/5/changed/ foo doener@atjola:x (master) $ git commit -am changed [master fe4ee44] changed 1 files changed, 1 insertions(+), 1 deletions(-) doener@atjola:x (master) $ git format-patch HEAD^ 0001-changed.patch doener@atjola:x (master) $ git checkout HEAD^ Note: moving to 'HEAD^' which isn't a local branch doener@atjola:x ((b59b963...)) $ git am 0001-changed.patch Applying: changed error: patch failed: foo:2 error: foo: patch does not apply Patch failed at 0001 changed When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Using "--whitespace=fix" makes the patch apply, but converts the changed line and the context area from CRLF to LF. Commit c2ca1d7 "Allow mailsplit ... to handle mails with CRLF line-endings" seems to be responsible. Using "git am --rebasing" to trigger the --keep-cr flag to mailsplit makes things work: doener@atjola:x ((b59b963...)) $ git am --rebasing 0001-changed.patch Applying: changed And reverting that commit also gives the expected whitespace warning (which is somehow squelched by the --rebasing flag it seems). doener@atjola:x ((b59b963...)) $ git am 0001-changed.patch Applying: changed /home/doener/x/.git/rebase-apply/patch:14: trailing whitespace. changed warning: 1 line adds whitespace errors. Björn -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html