Bug 2218280

Summary: git-review release incompatible w/ git version shipped in epel8 and epel9
Product: [Fedora] Fedora EPEL Reporter: c.felder
Component: git-reviewAssignee: Pete Zaitcev <zaitcev>
Status: CLOSED ERRATA QA Contact: Fedora Extras Quality Assurance <extras-qa>
Severity: medium Docs Contact:
Priority: unspecified    
Version: epel8CC: zaitcev
Target Milestone: ---   
Target Release: ---   
Hardware: All   
OS: Linux   
Whiteboard:
Fixed In Version: git-review-2.2.0-1.el8 Doc Type: If docs needed, set a value
Doc Text:
Story Points: ---
Clone Of: Environment:
Last Closed: 2023-08-10 01:00:28 UTC Type: Bug
Regression: --- Mount Type: ---
Documentation: --- CRM:
Verified Versions: Category: ---
oVirt Team: --- RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: --- Target Upstream Version:
Embargoed:

Description c.felder 2023-06-28 14:35:31 UTC
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.

Comment 1 Pete Zaitcev 2023-07-31 20:27:19 UTC
A 2.2.0 ought to fix this.

https://koji.fedoraproject.org/koji/buildinfo?buildID=2230691

Comment 2 Fedora Update System 2023-08-01 14:52:28 UTC
FEDORA-EPEL-2023-a22af6f0ec has been submitted as an update to Fedora EPEL 8. https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2023-a22af6f0ec

Comment 3 Fedora Update System 2023-08-02 01:39:05 UTC
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.

Comment 4 Fedora Update System 2023-08-10 01:00:28 UTC
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.