I'm running Mac OSX 10.9.4 (Mavericks) and have git version 2.8.2. I've tested this with a completely new repo. Here's example.
mkdir gitest
cd gitest
git init
echo "monkeyface" > monkey.txt
git commit -m "first commit"
echo "monkeyface farted" > monkeyfart.txt
git add .
git diff HEAD > new.patch
rm monkeyfart.txt
git reset --hard HEAD
git apply new.patch --check
>fatal: unrecognized input
Any ideas what is causing this? Could it be anything in my .gitconfig file?
[user]
name = myusername
email = myemail@mail.com
[color]
ui = always
[alias]
st = status -sb -uall
lg = log --decorate --pretty=oneline --abbrev-commit --graph
undocommit = reset --soft HEAD^
undopush = push -f origin HEAD^:master
[core]
editor = vim
excludesfile = ~/.gitignore_global
pager = less -r
[commit]
template = ~/.gitmessage.txt
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
UPDATE:
While the answer linked below offers some idea on what the problem might have been, my issue was specifically hidden in my configuration since no color argument was being passed into the command. This answer is relevant but my question and answer might be helpful to others who may experience a similar issue.
First thing is to ignore color when creating the patch
git diff --no-color > my_patch.patch
You might have a file which was not encoded to UTF-8. To fix that on *nix systems (MacOS, Linux etc.)
iconv -f ascii -t utf-8 fix.patch -o fix_utf8.patch
For windows you can try:
Get-Content .\fix.patch | Set-Content -Encoding utf8 fix_utf8.patch
If your file may already have color codes in it you can try:
git apply --reject --whitespace myfile.patch
Passing in no-color param also git diff HEAD --color=never > fix.patch
And now check returns no error message.
git apply fix.patch --check
Changing my .gitconfig file from
[color]
ui = always
change to always
[color]
ui = auto
Fixed my problem so I do not have to pass color option when diffing to patch file.
UPDATE: Based on saurabheights answer, you don't even need to brew link gnu-sed
, you can do this with pearl. This will removed color characters from the bad patch file as well. There are probably many ways to do this.
perl -pe 's/\x1b.*?[mGKH]//g' bad.patch > good.patch