Bug 259855 - devel/git: 2.33.1 breaks "pull (--rebase) --ff-only"
Summary: devel/git: 2.33.1 breaks "pull (--rebase) --ff-only"
Status: Closed Works As Intended
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Renato Botelho
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-11-15 14:41 UTC by Daniel Engberg
Modified: 2021-11-25 13:09 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (garga)

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Daniel Engberg freebsd_committer freebsd_triage 2021-11-15 14:41:51 UTC 
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.
Comment 2 Warner Losh freebsd_committer freebsd_triage 2021-11-15 22:58:34 UTC 
Pilot error. Don't do both.

git pull --rebase

is what you want. Doing both, --ff-only takes precedence and if you've added local changes, it's correct that it can't fast forward.

Perhaps pull should warn of both are specified, but it doesn't.
Comment 3 Renato Botelho freebsd_committer freebsd_triage 2021-11-25 13:09:14 UTC 
As mentioned, it works as expected.  Also, it's not a FreeBSD specific problem so the right place to report it is upstream.