error: addinfo_cache failed while cherrypicking

gerrit cherry-pick git-cherry-pick
carte blanche picture carte blanche · Apr 19, 2013 · Viewed 7.2k times · Source

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

Nikhil Gupta picture Nikhil Gupta · May 3, 2014

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.

Related questions

How to cherry pick from branch A to branch B on a system without history?

Suppose I have a new system with no git history and I take a fresh checkout of branch A. Branch A already has a commit C1 which I did yesterday from some other system. Now I want to cherry-pick this …

Read More
Git workflow and Gerrit

I am trying to implement a 'git-flow' kind of workflow using Gerrit but I can't seem to figure out the last piece of the puzzle. There are two preconditions to my problem: Gerrit will only perform merging to one branch …

Read More
Why is git push gerrit HEAD:refs/for/master used instead of git push origin master

I've just started using gerrit and I want to know why we need to do git push gerrit HEAD:refs/for/master instead of doing git push origin master If I do git push origin master I get the error …

Read More