Page MenuHomePhabricator

Git review trying to push old commits
Closed, ResolvedPublic

Description

Since upgrading to new version of gerrit, one must do weird things like 'git fetch gerrit' or configure gerrit as the remote or git review doesn't recognize that the commits have already been merged into master through gerrit.


Version: unspecified
Severity: normal
URL: https://review.openstack.org/#/c/6741

Details

Reference
bz35951

Event Timeline

bzimport raised the priority of this task from to Medium.Nov 22 2014, 12:17 AM
bzimport added projects: Gerrit, Upstream.
bzimport set Reference to bz35951.

Can you try with to do exactly the same with the old version (I think it was 1.15 - https://review.openstack.org/gitweb?p=openstack-ci/git-review.git;a=commit;h=f719a31954cf064914a03b0cb443e44f6a41d370)?

We didn't try to change the logic in the recent changes - only "-r" option was added to use something else instead of "gerrit".

I mean, it's still a problem (and I have a fix at hand) but I want to make sure I didn't introduce a regression.

(In reply to comment #0)

Since upgrading to new version of gerrit, one must do weird things like 'git
fetch gerrit' or configure gerrit as the remote or git review doesn't recognize
that the commits have already been merged into master through gerrit.

I think you mean since an update of git review? (You said git review in the title too. We're still on Gerrit 2.2.1)

I experienced similar after updating git review when prompted (as I was running an old version)

For laziness, I deleted the checkout and pulled it fresh...

Since there has been multiple reports and even mailing list post about this, I'm moving back to NEW from UNCONFIRMED.

Bug housekeeping. Roan wrote:
The *real* solution is to fix git-review so it fetches updates from
the gerrit remote just before it checks your commits against it. I
have submitted this as https://review.openstack.org/#/c/6741 .

(In reply to comment #4)

Bug housekeeping. Roan wrote:
The *real* solution is to fix git-review so it fetches updates from
the gerrit remote just before it checks your commits against it. I
have submitted this as https://review.openstack.org/#/c/6741 .

This was merged in and will be in the next release of git-review.

(In reply to comment #5)

(In reply to comment #4)

Bug housekeeping. Roan wrote:
The *real* solution is to fix git-review so it fetches updates from
the gerrit remote just before it checks your commits against it. I
have submitted this as https://review.openstack.org/#/c/6741 .

This was merged in and will be in the next release of git-review.

Was this version pushed out at some point? I haven't seen complaints recently about it.

Roan patch is included since git-review v1.17