2012/4/13 Antoine Musso hashar+wmf@free.fr:
There are three ways to fix it:
1) always update all remotes by using either: - git fetch --all - git remote update
Side effect: you have to remember to use those commands instead of 'git fetch' or 'git pull origin'.
Two commands are worse than one, so probably no.
2) delete the remote named 'origin': - git remote rm origin
Side effect: 'git pull origin' does not work anymore :-) You need to use 'git pull gerrit'.
There's nothing wrong with it, as long as it is documented properly and everybody uses it.
3) Tell .gitreview to use 'origin' by adding the following line:
defaultremote=origin
Make sure you have a remote named origin, if not rename the one named gerrit :D Side effect: I can not think of any.
Side effect: As long as it's not standard, you have an uncommitted .gitreview file and it various git operations complain about it.
I use (2) aka a remote named 'gerrit'. I recommend (3) make git-review use 'origin' and I think we should modify our .gitreview file to add that line. That will avoid confusion.
So is there any decision about it?
Something is needed, and in the meantime the docs [1] don't address it.
[1] https://www.mediawiki.org/wiki/Git/Workflow
-- Amir Elisha Aharoni · אָמִיר אֱלִישָׁע אַהֲרוֹנִי http://aharoni.wordpress.com “We're living in pieces, I want to live in peace.” – T. Moore