Bug 886452

Summary:	sys-apps/portage: sync-git-pull-extra-opts is no longer usable
Product:	Portage Development	Reporter:	konsolebox <konsolebox>
Component:	Core - Configuration	Assignee:	Portage team <dev-portage>
Status:	UNCONFIRMED ---
Severity:	normal	CC:	flow
Priority:	Normal	Keywords:	REGRESSION
Version:	unspecified
Hardware:	All
OS:	Linux
See Also:	https://bugs.gentoo.org/show_bug.cgi?id=660372
Whiteboard:
Package list:		Runtime testing required:	---

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

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.)