Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 886452 - sys-apps/portage: sync-git-pull-extra-opts is no longer usable
Summary: sys-apps/portage: sync-git-pull-extra-opts is no longer usable
Status: UNCONFIRMED
Alias: None
Product: Portage Development
Classification: Unclassified
Component: Core - Configuration (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Portage team
URL:
Whiteboard:
Keywords: REGRESSION
Depends on:
Blocks:
 
Reported: 2022-12-17 06:36 UTC by konsolebox
Modified: 2023-12-14 08:49 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description konsolebox 2022-12-17 06:36:59 UTC
Commit in question is https://github.com/gentoo/portage/commit/3cd8cf93abb6410cc877381531bb662a704dffa7.

It changed syncing method for git from pull to fetch+merge making sync-git-pull-extra-opts unusable since options like --rebase or --ff-only aren't recognizable by either fetch or merge or both.  `sudo -u portage git config --global merge.ff only` might help as an alternative to --ff-only but not with rebase.  --ff-only is actually just an example and is useless in my case.

I suggest if this method isn't going to change, just drop the sync-git-pull-extra-opts option and probably add sync-git-fetch-extra-opts and sync-git-merge-extra-opts, even just for the sake of consistency.

Maybe also allow something like sync-git-merge-method = rebase and add sync-git-rebase-extra-opts option so git-rebase is used instead of merge, but that's another feature request to make.  But first drop sync-git-pull-extra-opts so people stops trying to rely on it.
Comment 1 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2023-12-14 08:49:36 UTC
(sorry flow, I know I've CC'd you on a bunch today, but I'm interested in your opinion on this one as well.)