FS#73057 - [git-review] Fatal error with git >= 2.34.0

Attached to Project: Arch Linux
Opened by John Beard (jjbeard) - Friday, 17 December 2021, 10:58 GMT
Last edited by Jelle van der Waa (jelly) - Monday, 24 July 2023, 18:42 GMT
Task Type Bug Report
Category Packages: Extra
Status Closed
Assigned To Felix Yan (felixonmars)
Architecture All
Severity Low
Priority Normal
Reported Version
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Votes 2
Private No

Details

Description: With any git version >= 2.34.0, an option changed, which results in:

Errors running git rebase -p -i remotes/gerrit/stable/xena
fatal: --preserve-merges was replaced by --rebase-merges

Mitigation:

No new release has been made for git-review, but you can cherry-pick https://opendev.org/opendev/git-review/commit/7182166ec00ad3645821435d72c5424b4629165f to resolve the issue (patch file attached too).

Additional info:
* Any Git version >= 2.34.0

Steps to reproduce:
* Issue `git review` on any suitable Gerrit-linked repo
   7182166ec0.patch (5.3 KiB)
This task depends upon

Closed by  Jelle van der Waa (jelly)
Monday, 24 July 2023, 18:42 GMT
Reason for closing:  Deferred
Additional comments about closing:  Package is no longer in the repos.
Comment by Andy Botting (andybz) - Tuesday, 11 January 2022, 11:04 GMT
I encountered this issue too, but it looks like the new release including this fix that you mention is actually tagged as part of v2.2.0 (see https://opendev.org/opendev/git-review/commit/25c2d3fe9678bb467952e8203cfc8c40f4a86a87) but it's not listed on the site due to some sort of bug with the OpenDev site.

There's a bit of background info that came up on the OpenStack mailing list here: http://lists.openstack.org/pipermail/openstack-discuss/2022-January/026546.html

@Felix could you please update this package to 2.2.0?

The new project URL should be https://opendev.org/opendev/git-review and the release tarball URL should be https://opendev.org/opendev/git-review/archive/2.2.0.tar.gz

I've got a working diff here: https://paste.opendev.org/show/812023/

Thanks

Loading...