Last modified: 2013-02-01 13:11:19 UTC

Wikimedia Bugzilla is closed!

Wikimedia migrated from Bugzilla to Phabricator. Bug reports are handled in Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See T37951, the corresponding Phabricator task for complete and up-to-date bug report information.
Bug 35951 - Git review trying to push old commits
Git review trying to push old commits
Status: RESOLVED FIXED
Product: Wikimedia
Classification: Unclassified
Git/Gerrit (Other open bugs)
unspecified
All All
: Normal normal (vote)
: ---
Assigned To: Roan Kattouw
https://review.openstack.org/#/c/6741
: upstream
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2012-04-13 18:56 UTC by Niklas Laxström
Modified: 2013-02-01 13:11 UTC (History)
6 users (show)

See Also:
Web browser: ---
Mobile Platform: ---
Assignee Huggle Beta Tester: ---


Attachments

Description Niklas Laxström 2012-04-13 18:56:54 UTC
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.
Comment 1 Marcin Cieślak 2012-04-13 20:48:27 UTC
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.
Comment 2 Sam Reed (reedy) 2012-04-13 21:08:53 UTC
(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...
Comment 3 Niklas Laxström 2012-04-14 08:18:18 UTC
Since there has been multiple reports and even mailing list post about this, I'm moving back to NEW from UNCONFIRMED.
Comment 4 Niklas Laxström 2012-04-24 10:21:58 UTC
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 .
Comment 5 Roan Kattouw 2012-04-25 01:16:46 UTC
(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.
Comment 6 Chad H. 2012-06-28 13:37:41 UTC
(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.
Comment 7 Antoine "hashar" Musso (WMF) 2013-02-01 13:10:40 UTC
Roan patch is included since git-review v1.17

Note You need to log in before you can comment on or make changes to this bug.


Navigation
Links