Applying a diff file with git

Question

So I was trying to use apply a diff file to my git dev branch. The diff I wanted to apply was this one here: https://github.com/mbabker/joomla-cms/compare/JHtml_move.patch I used `git apply PATH_TO_PATCH.patch` Now on trying to apply it I get a load of errors cumulating with a ``` fatal: git apply: bad git-diff - expected /dev/null on line 47 ``` Thing is line 47 reads `--- /dev/null` I saw on another forum somebody say there was a trailing white space after the `/dev/null` part but there isn't. In case its any help I'm also being thrown errors of trailing white spaces on lines 9, 10, 11, 12 and 13 - despite their NOT being any trailing white spaces. In any case the diff is being generated by git - I'm just copying and pasting it into notepad. I've also tried using `curl https://github.com/mbabker/joomla-cms/compare/JHtml_move.patch | git am` but that just gives an error without specifying location. Any ideas as to why its giving an fatal error when the line actually exists???? Update…

Accepted Answer

I also had the same problem:

```
fatal: git apply: bad git-diff - expected /dev/null on line 47
```

Yet line 47 reads `--- /dev/null`. The problem I found was that the line endings were in Windows format instead of UNIX format. Converting the line endings to UNIX format in Notepad++ fixed the problem for me.

Applying a diff file with git

Solution

Problem