[Bug 259855] devel/git: 2.33.1 breaks "pull (--rebase) --ff-only"

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: <bugzilla-noreply_at_freebsd.org>
Date: Mon, 15 Nov 2021 14:41:51 UTC

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259855

            Bug ID: 259855
           Summary: devel/git: 2.33.1 breaks "pull (--rebase) --ff-only"
           Product: Ports & Packages
           Version: Latest
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Only Me
          Priority: ---
         Component: Individual Port(s)
          Assignee: garga@FreeBSD.org
          Reporter: diizzy@FreeBSD.org
                CC: yasu@freebsd.org
          Assignee: garga@FreeBSD.org
             Flags: maintainer-feedback?(garga@FreeBSD.org)

I reserve the right to be "using it wrong" but this setup worked fine in <=
2.33.0 and still does

* Pull ports tree
* Follow https://wiki.freebsd.org/Ports/GitQuickStart including setting git
config pull.rebase true
* Commit changes
* git pull --ff-only
fatal: Not possible to fast-forward, aborting.
* git pull --rebase --ff-only
fatal: Not possible to fast-forward, aborting.

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