I had the same problem with some file.
First tried to commit a bunch of files - fail. Then commited one by one till I found the problematic file. After that just:
deleted the file
commit
added it back
Boom, it works!