[Bug 262148] [PATCH] devel/git-review: Fix compatibility with git 2.34.0 and later

From: <bugzilla-noreply_at_freebsd.org>
Date: Wed, 23 Feb 2022 13:52:19 UTC

            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: marek@mky.waw.pl
                CC: dereckson@gmail.com
                CC: dereckson@gmail.com
             Flags: maintainer-feedback?(dereckson@gmail.com)

Created attachment 232040
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=232040&action=edit

The latest version of git (2.34.0) removes "--preserve-merges" option of "git
rebase" [1]. 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 [2], 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. 

[1] https://github.com/git/git/blob/v2.34.0/Documentation/RelNotes/2.34.0.txt

You are receiving this mail because:
You are the assignee for the bug.