error: addinfo_cache failed while cherrypicking

Question

I am getting the followinge error while cherry-picking a gerrit...does anyone have info on what this means and why would anyone see it?

error: addinfo_cache failed for path 'ROE/NAS/src/abc.c

Answer 1

Looks like this has something to do with the whitespace and EOL. I also got the same issue today and just used the git-->mergetool to resolve the issue based on the following thread - http://git.661346.n2.nabble.com/error-addinfo-cache-failed-during-merge-tp6840473p6840622.html.

The only cause of concern, I now see the entire file modified instead of just the two lines which were part of my cherry-pick changeset.