Description of problem: The current release (1.28.0) shipped w/ epel8 and epel9 uses the the --preserve-merges` (-p) option which is no longer supported w/ the git version shipped (2.39.1). The feature has been deprecated for a long time and iirc has been removed w/ release 2.38. Version-Release number of selected component (if applicable): 1.28.0 How reproducible: Create an additional commit on a repo with a merge commit and try submitting that patch using git review. Steps to Reproduce: 1. clone repo w/ merge commit 2. add additional commit 3. submit using e.g. `git review -T` Actual results: ``` $ git review -T Enter passphrase for key '/home/felder/.ssh/id_rsa': Errors running git rebase -p -i remotes/origin/master fatal: --preserve-merges was replaced by --rebase-merges Note: Your `pull.rebase` configuration may also be set to 'preserve', which is no longer supported; use 'merges' instead It is likely that your change has a merge conflict. You may resolve it in the working tree now as described above and then run 'git review' again, or if you do not want to resolve it yet (note that the change can not merge until the conflict is resolved) you may run 'git rebase --abort' then 'git review -R' to upload the change without rebasing. ``` Expected results: ``` remote: remote: Processing changes: new: 1, updated: 6 (\) remote: Processing changes: refs: 1, new: 1, updated: 6 (\) remote: Processing changes: refs: 1, new: 1, updated: 6 (\) remote: Processing changes: refs: 1, new: 1, updated: 6 (\) remote: Processing changes: refs: 1, new: 1, updated: 6, done remote: commit 49a7010: warning: subject >50 characters; use shorter first paragraph remote: commit 5252e9a: warning: subject >50 characters; use shorter first paragraph remote: commit da27ac6: warning: subject >50 characters; use shorter first paragraph remote: commit 1435de4: warning: subject >50 characters; use shorter first paragraph remote: remote: SUCCESS remote: remote: https://example.com/review/c/path/to/repo/+/31290 ``` Additional info: git-review added a switch depending on the installed git version w/ release 2.1.0 which should fix that problem (commit: 7182166ec00ad3645821435d72c5424b4629165f). If it is not desirable to align with the versions shipped in fedora (currently 2.3.1 which is also the latest on pypi) it would be nice to upgrade at least to 2.1.0.
A 2.2.0 ought to fix this. https://koji.fedoraproject.org/koji/buildinfo?buildID=2230691
FEDORA-EPEL-2023-a22af6f0ec has been submitted as an update to Fedora EPEL 8. https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2023-a22af6f0ec
FEDORA-EPEL-2023-a22af6f0ec has been pushed to the Fedora EPEL 8 testing repository. You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2023-a22af6f0ec See also https://fedoraproject.org/wiki/QA:Updates_Testing for more information on how to test updates.
FEDORA-EPEL-2023-a22af6f0ec has been pushed to the Fedora EPEL 8 stable repository. If problem still persists, please make note of it in this bug report.