Date: Wed, 23 Feb 2022 13:52:19 UTC
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262148 Bug ID: 262148 Summary: [PATCH] devel/git-review: Fix compatibility with git 2.34.0 and later Product: Ports & Packages Version: Latest Hardware: Any OS: Any Status: New Severity: Affects Only Me Priority: --- Component: Individual Port(s) Assignee: ports-bugs@FreeBSD.org Reporter: email@example.com CC: firstname.lastname@example.org CC: email@example.com Flags: maintainer-feedback?(firstname.lastname@example.org) Created attachment 232040 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=232040&action=edit 0001-Compatibility-fix-for-git-2.34.patch The latest version of git (2.34.0) removes "--preserve-merges" option of "git rebase" . This change breaks git-review with the following error: fatal: --preserve-merges was replaced by --rebase-merges This bug was fixed in the git-review code in the commit id 7182166ec00ad3645821435d72c5424b4629165f , however there is no new release of git-review yet. I extracted the patch from this commit and tested it with the current version of git-review (1.28.0). I can confirm, that the patched version of git-review works fine with the current version of git (2.34.0). Please check prepared patch for the FreeBSD port. Links:  https://github.com/git/git/blob/v2.34.0/Documentation/RelNotes/2.34.0.txt  https://opendev.org/opendev/git-review/commit/7182166ec00ad3645821435d72c5424b4629165f -- You are receiving this mail because: You are the assignee for the bug.