Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Git ignore BOM (prevent git diff from showing byte order mark changes)

I want git diff to not show BOM changes.
Such changes typically show up as <feff> in the diff:

-<feff>/*^M
+/*^M

How can I make git diff to behave this way?
Preferably with a command-line parameter.

git --ignore-all-space (aka git -w) does not do the trick. I am on Mac OS X if that matters.

like image 979
Nicolas Raoul Avatar asked Dec 01 '14 07:12

Nicolas Raoul


1 Answers

Use Git Attributes filter

One possible solution would be to create a BOM filter such as:

#!/bin/bash
sed '1s/^\xEF\xBB\xBF//' "$1"

store it somewhere in your path (as i.e. removebom) and make it executable.

Then you need to configure the filter in Git by running:

$ git config diff.removebom.textconv removebom

and adding an attribute for files you are interested in (i.e. cpp) to your repository:

*.cpp diff=removebom

as a .gitattributes file.

More on the topic can be found on:

  • https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#_diffing_binary_files
  • https://unix.stackexchange.com/questions/381230/how-can-i-remove-the-bom-from-a-utf-8-file

Or remove the BOM once for all

... because, hopefully, the BOM may be removed once and for all in your project :)

like image 186
petrpulc Avatar answered Sep 21 '22 16:09

petrpulc