git diff 4ee42367 8c650199 > changes2.patch
git checkout newBranch
git apply changes2.patch
error: unrecognized input
When i tried to apply the changes i'll get the error. What i'm doing wrong?
7 Answers
I figured out this problem as instructed below,
git checkout -b new_branchand commit somethinggit diff master --no-color > your_patch_file.patch- Open "your_patch_file.patch" file with NotePad++ and edit that file like,
- Encoding > Convert to UTF-8
- Edit > EOL Conversion > Unix (LF)
- Save file
git checkout mastergit apply your_patch_file_name.patch
Or you can run your git commands on Git Bash, probably you won't encounter any problem.
3 Comments
NeilG
Just the
--no-color option fixed it for me. The escape sequences to generate coloured output are obviously unwanted.
runtimeTerror
@NeilG I made the patch with
--no-color flag, still it gave me the same error, I think this should be the accepted answer. This solved the issue form me. My OS is Win11Evyatar Sivan
This worked for me when creating the patch on a windows OS and applying it on a WSL ubuntu image
In case anyone else has this issue: for me, Powershell was the culprit. using Anentropic's answer from within git bash resulted in a "good" (readable) patch.
2 Comments
Petr
Apparently, Powershell produces output in UTF-16, which get can not consume.
Nate
Here is a link with information on how to mitigate this in Powershell: stackoverflow.com/questions/40098771/…. Simple fix is to run
$PSDefaultParameterValues['*:Encoding'] = 'utf8' first.Do you have coloured output enabled by default?
If git diff 4ee42367 8c650199 shows up coloured in your terminal then the colour codes will get output to the patch file
Then git apply will fail with error: unrecognized input
In this case try instead with git diff --no-color
1 Comment
Clay
you da man! you pointed me in the right direction to fix a bug in
lerna github.com/lerna/lerna/pull/2037For those running this form within Powershell, here is another post with information about the encoding error, and why it is happening.
If you're just looking for an answer, you can edit your powershell profile:
PS> code $profile
and add
$PSDefaultParameterValues['Out-File:Encoding'] = 'utf8'
This can cause other issues, so use at your own risk.
If you just want to run it for a single instance, you can do this
$PSDefaultParameterValues['Out-File:Encoding'] = 'utf8'
git diff > change.patch
git checkout otherbranch
git apply change.patch
1 Comment
wrestang
Thanks, this answer is actually almost exactly what I needed. GIT was still unappreciative of my the CLRF lines (which I recognize can largely boil down to git settings as well). I fixed that (with cygwin vi), and things were good.
In my case problem was that I was generating the patch in PowerShell in Windows and then trying to apply that patch in Linux.
After looking frantatically on web for hours I found problem was due to PowerShell. I then created the patch using git bash in Windows and applied that on the Linux without any issue.
Looks like there might charset differernce or powershell might adding some characters which git did not understant on Linux.
Posted my answer here as it might help people who land up on this question with this error.
1 Comment
Ron
Thanks for your answer, I just run into the same case like you with git in PowerShell.
Just like @irsis, I also ran into this problem when I was generating the patch in PowerShell on Windows and then trying to apply that patch on Linux. Thanks to irisis, I find out the way to apply it. You don't need to install git shell on Windows, but with cmd.exe to generate the patch again. That patch can be applied on Linux. You can find that the patch file can be only half the size of that one generated in PowerShell.
Put in other words, use git command in CMD instead of PowerShell to generate patch file, while better to use --no-color option in case other issue.
Comments
Go the same problem after generating the patch from PowerShell. The classic 'dos2unix' command solved the issue
changes2.patch?--full-indexand--binaryoptions forgit diffmight help. I'm assuming those hashes are either commit ID's, or appropriate tree ID's; and my guess is that you just have content that messes up a basic diff (as far as being able to create an applicable patch); but none of the combinations I tried got this exact symptom (at least, on my version of git), so I'm not sure.