From nobody Mon Jan 09 19:14:35 2023 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NrNtH1mpHz2pKkq for ; Mon, 9 Jan 2023 19:14:47 +0000 (UTC) (envelope-from gshapiro@freebsd.org) Received: from zim.gshapiro.net (zim.gshapiro.net [IPv6:2001:bc8:2e97:100::100]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.gshapiro.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NrNtG3ntwz4QN1; Mon, 9 Jan 2023 19:14:46 +0000 (UTC) (envelope-from gshapiro@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from C02Y1186JHD2.corp.proofpoint.com ([208.86.202.9]) (authenticated bits=0) by zim.gshapiro.net (8.17.0.4/8.17.0.4) with ESMTPSA id 309JEaWo095424 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 9 Jan 2023 19:14:41 GMT Date: Mon, 9 Jan 2023 11:14:35 -0800 From: Gregory Shapiro To: Warner Losh Cc: Philip Paeps , freebsd-git@freebsd.org Subject: Re: Vendor import push failed: src refspec ... does not match any Message-ID: <20230109191435.jdod56db5ewpxajm@C02Y1186JHD2.corp.proofpoint.com> References: <20230109023126.kjjynari5b6jpqxo@thornystick.local> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: 4NrNtG3ntwz4QN1 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12876, ipnet:2001:bc8::/32, country:FR] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Thanks for the responses. Some followup: > >> git worktree add ../vendor/sendmail freebsd/vendor/sendmail > > You needed to add '-b vendor/sendmail' here for it to create a branch > in your local name space (not in the freebsd/* upstream namespace). Does the documentation at: https://docs.freebsd.org/en/articles/committers-guide/#vendor-import-git Need to be updated? Specifically, section 5.4 never talks about including a '-b' flag in the git worktree command. '-b' is mentioned for creating a new vendor branch but sendmail as a vendor is not new and the branch is already listed as existing: https://cgit.freebsd.org/src/log/?h=vendor/sendmail > Yes. You've not created a vendor/sendmail branch yet, so there's no > 'ref' to push. This message really is git saying 'I'm not sure I know > what vendor/sendmail is', since it uses that to know what to push > upstream. This is where having the upstream set correctly just might > matter. I'll note this is not the first vendor import of sendmail source so I want to make sure not to break anything by creating a new branch for a pre-existing vendor package. > Yea, git makes it stupidly easy to throw away work that's somehow done > incorrectly the first time... Happy to restart once I am sure I won't break the existing vendor import of sendmail.