FS#73058 - Fatal error with recent Git versions: fatal: --preserve-merges was replaced by --rebase-merges

Attached to Project: Arch Linux
Opened by John Beard (jjbeard) - Friday, 17 December 2021, 11:39 GMT
Last edited by Antonio Rojas (arojas) - Saturday, 18 December 2021, 18:06 GMT
Task Type Bug Report
Category Packages: Extra
Status Closed
Assigned To No-one
Architecture All
Severity High
Priority Normal
Reported Version
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Votes 0
Private No

Details

Description:

Since Git 2.34.0, any use of git review results in:

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

See
* the upstream bug: https://storyboard.openstack.org/#!/story/2009690
* the upstream fix: https://opendev.org/opendev/git-review/commit/7182166ec00ad3645821435d72c5424b4629165f
* the upstream release note: https://opendev.org/opendev/git-review/commit/25c2d3fe9678bb467952e8203cfc8c40f4a86a87

Mitigation:

There is now new upstream release, but the 7182166ec0 commit can be cherry-picked. Patch file is attached.

Steps to reproduce:
* `cd` to any git repo using gerrit
* make a change
* `git review`
* error!
   7182166ec0.patch (5.3 KiB)
This task depends upon

Closed by  Antonio Rojas (arojas)
Saturday, 18 December 2021, 18:06 GMT
Reason for closing:  Duplicate

Loading...