Ask Your Question

Revision history [back]

One possible explanation is that your "origin" remote is stale or otherwise in an odd state, and that's why when you reset to origin/master you're ending up with lots of divergence from what's in the code review system. We actively mirror the python-novaclient Git repository to git.openstack.org/openstack/python-novaclient and github.com/openstack/python-novaclient so if your origin is one of those, it should be fine. Use 'git remote -v' so see your full list of remote URLs. For example, mine looks like...

$ git remote -v
gerrit  ssh://fungi@review.openstack.org:29418/openstack/python-novaclient.git (fetch)
gerrit  ssh://fungi@review.openstack.org:29418/openstack/python-novaclient.git (push)
origin  git://git.openstack.org/openstack/python-novaclient.git (fetch)
origin  git://git.openstack.org/openstack/python-novaclient.git (push)

If it looks like you may have cloned from an outdated fork somewhere else, try updating it with 'git remote set-url origin <newurl>' and see whether that helps.