mediatribe.net -- Drupal et développement web

Accueil
Notice: this post was last updated Il y a 4 years 51 weeks so it might be outdated. Please be cautious before implementing any of suggestions herein.

Creating and applying a Drupal patch with binary files

Submitted by Albert on Sun, 07/22/2012 - 07:49

I am normally in the habit of creating my patches with the commands "git diff 123456 abcdef > patch.patch" (where 123456 and abcdef are commits); and applying the patch with "patch -p1 < patch.patch".

This works fine unless you have binary files. For example, for this issue I needed to include a new .gz file in my patch, and the above technique was causing a fail.

To create and apply patches with binary files, the following technique works to create a patch:

git diff --full-index --binary 123456 abcdef > patch.patch

And to apply the above patch, use

git apply -p1 < patch.patch

Please note that in D8 this

Submitted by Anonymous on Thu, 01/29/2015 - 16:06.

Please note that in D8 this won't work most of the time since the root .gitattributes enforces a text diff. You can edit the .gitattribute file temporarily and diff only the core directory as a workaround.

Thanks for the tip!

Submitted by root on Fri, 01/30/2015 - 09:27.

Thanks for the tip!