Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Nov 2021 14:41:51 +0000
From:      bugzilla-noreply@freebsd.org
To:        ports-bugs@FreeBSD.org
Subject:   [Bug 259855] devel/git: 2.33.1 breaks "pull (--rebase) --ff-only"
Message-ID:  <bug-259855-7788@https.bugs.freebsd.org/bugzilla/>

next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D259855

            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 <=
=3D
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.

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-259855-7788>