From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 96D901382C5 for ; Thu, 1 Feb 2018 05:31:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C546E0A03; Thu, 1 Feb 2018 05:31:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44AC1E09BF for ; Thu, 1 Feb 2018 05:31:04 +0000 (UTC) Received: from grubbs.orbis-terrarum.net (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E114B335C05 for ; Thu, 1 Feb 2018 05:31:03 +0000 (UTC) Received: (qmail 31012 invoked by uid 10000); 1 Feb 2018 05:31:02 -0000 Date: Thu, 1 Feb 2018 05:31:02 +0000 From: "Robin H. Johnson" To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] Gentoo Overlay Git: Feature Branches Message-ID: References: Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.2 (2017-04-18) X-Archives-Salt: 6e18a6eb-de9e-4a1a-9007-8345d74eacf7 X-Archives-Hash: 70141f1a48de273c48923fe41deb72cd On Wed, Jan 31, 2018 at 09:32:39PM -0500, Lucas Ramage wrote: > Hello, > > Is there a way to specify a branch in repos.conf/overlay_name.conf? The source of Portage's pym/portage/sync/modules/git/git.py contains this comment: def update(self): ''' Update existing git repository, and ignore the syncuri. We are going to trust the user and assume that the user is in the branch that he/she wants updated. We'll let the user manage branches with git directly. ''' To that end, I think the answer is no. If this were to change, there are a bunch of questions that would need agreement in how they are answered: - if the repo's remote URI has changed, should we update the git checkout's remote URI from sync-uri? (what if there are multiple remotes in the checkout?) - if the repo's branch has changed in the config, should we update the checkout's branch? -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robbat2@gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136