From nobody Mon Jan 09 06:16:57 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 4Nr3cs0PCFz2r71Z for ; Mon, 9 Jan 2023 06:17:01 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nr3cr7473z4GvR; Mon, 9 Jan 2023 06:17:00 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673245021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3jeg7SN4CkJGEU8CsEiVpB1qDrEVqqvYLU+Ji0tBx+w=; b=fhSQ0+hfWyNgIDWI0YhEUYmd1/GDqHR7tIvsoNxOszvMUqSBBuLOrlsvYg1iLRRbHDBaxC E/FiitJiAHnFM4EAZXzFI6F/Q7ctzVFRlAZ0rb2Jta7z/OId1DQiVOfva88NR73+IzDkbQ Zckrd8Y4d2idf6VXVZh4GnjIoxV26fCBLBsZqbFE8O+Tct0pwmsOlQMv2n0WOBmd0cd52I YesV4WtzmMdwsYv55MwBIhkOluKJDSFMbrNuEZLKQXHPCFv4kkC5Xs/tOXjtJIMS41EzN5 LelQih7tK2P+He+SUJac3xk9joZqSDnKkr31iEz6Cg28PDuYbbeMFFYPcWnEyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673245021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3jeg7SN4CkJGEU8CsEiVpB1qDrEVqqvYLU+Ji0tBx+w=; b=wULVIFM7TLoilIXmZJnOGvJiF+k9qx0dk8D0VoB7099t7ckHrYcRqq905TL0dvdRATuqf4 hOWzUdInRZhCn5hl3VWclk5DKY/Cre5W0PaFjNnTCR1LNvCqUNiUHXV+YV58U9dk9PZY8s ZgI1FZauQWPBvAiF7pw5nMoCQXYqX4EIq+2sJK+1H6+bg76H4jyTzdn8ijK4EqmL06xQMq n0ed0FFfjmwcP23weB8mjN/YZTyKZMG67jPPkUGFCtWLgxPz0hguhngHOg05LuQ7FHVrBd 4LeDtV+mJ78/LuCdajNij5f/jq9GKJw3HVJBdizshV1pwyVksTkGwUwO2qnL1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673245021; a=rsa-sha256; cv=none; b=N3w4tLEa7HMhVDq9DjNYd4XBFq8iaz2JOCsEnl5b2T+L/SHk0MYKGAeCaN+Aobcr+pwXzp OGmN+WQo/op49x0bbzuo/9YhdVGXSMnlDSWyhgLGqZEsG0M1llvkVmwVCf51bslknMQNOb IZEy68TArlpF/8h0ousnfcrBE+jdpnuD52+picf6U7bYHDkwH72b5AlOEZqmKSqwaaAZ/2 35F0YBBeUCIMaHNG7YeFHmISmkT1pc40uQ/0NUwUZnqFiy3S/6KKWww16qCFeZOrJ9U+Bi IB/5Q4LaIrgCV2E0kI2vRGwWAiQtLTjs2EieGkrZx5AwrDiAN3Cz8xoy+LqEVw== Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (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 did not present a certificate) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Nr3cr5tlczMMj; Mon, 9 Jan 2023 06:17:00 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailauth.nyi.internal (Postfix) with ESMTP id 3655127C0054; Mon, 9 Jan 2023 01:17:00 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 09 Jan 2023 01:17:00 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrkeehgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffoffkjghfgggtsehttdhmtdertddtnecuhfhrohhmpefrhhhilhhi phcurfgrvghpshcuoehphhhilhhiphesfhhrvggvsghsugdrohhrgheqnecuggftrfgrth htvghrnhepvdehheekgffhieetheetudduuefhvdegtedtiefhffelueetgeegtedutddt udefnecuffhomhgrihhnpehfrhgvvggsshgurdhorhhgnecuvehluhhsthgvrhfuihiivg eptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpodhmvghsmhhtphgruhht hhhpvghrshhonhgrlhhithihqdduudeiiedviedvgeekqddvfeehudektddtkedqphhhih hlihhppeepfhhrvggvsghsugdrohhrghesthhrohhusghlvgdrihhs X-ME-Proxy: Feedback-ID: ia691475d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Jan 2023 01:16:59 -0500 (EST) From: Philip Paeps To: Gregory Shapiro Cc: freebsd-git@freebsd.org Subject: Re: Vendor import push failed: src refspec ... does not match any Date: Mon, 09 Jan 2023 14:16:57 +0800 X-Mailer: MailMate (1.14r5933) Message-ID: In-Reply-To: <20230109023126.kjjynari5b6jpqxo@thornystick.local> 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; format=flowed X-ThisMailContainsUnwantedMimeParts: N On 2023-01-09 10:31:26 (+0800), Gregory Shapiro wrote: > I'm doing my first vendor import since the move to git. Following the > instructions in section 5.4 of committers-guide/#git-primer, I hit a > roadblock trying to push the new version to the vendor branch. My > actions are below, including the failure to push at the end. What > should have I have done differently? > > >> cd src/freebsd/main >> git remote -v > freebsd https://git.freebsd.org/src.git (fetch) > freebsd git@gitrepo.freebsd.org:src.git (push) >> git pull > Already up to date. >> git status > On branch main > Your branch is up to date with 'freebsd/main'. > > nothing to commit, working tree clean >> git worktree add ../vendor/sendmail freebsd/vendor/sendmail > Preparing worktree (detached HEAD 0694dcb04b81) > HEAD is now at 0694dcb04b81 Bring in fix from upstream that allows > libsm to compile against FreeBSD 13 >> cd ../vendor/sendmail >> rsync --archive --delete --exclude=.git ~/Work/fb/sendmail-8.17.1/ ./ >> git add -A >> > ... > (checked git status, git diff, all looked good at first, though after > the error, I see that git status reports, "Not currently on any > branch.") > ... >> git commit -m "Vendor import of sendmail 8.17.1" > [detached HEAD e2db8b1cc34e] Vendor import of sendmail 8.17.1 > 188 files changed, 13741 insertions(+), 8635 deletions(-) > create mode 100644 cf/feature/check_other.m4 > create mode 100644 cf/feature/sts.m4 > mode change 100644 => 100755 contrib/doublebounce.pl > mode change 100644 => 100755 contrib/link_hash.sh > mode change 100644 => 100755 contrib/re-mqueue.pl > create mode 100644 devtools/OS/Darwin.19.x > create mode 100644 devtools/OS/Darwin.20.x > create mode 100644 include/sm/ixlen.h > create mode 100644 libsm/ilenx.c > create mode 100644 libsm/lowercase.c > create mode 100644 libsm/strcaseeq.c > create mode 100644 libsm/t-ixlen.c > create mode 100755 libsm/t-ixlen.sh > create mode 100644 libsm/t-str2prt.c > create mode 100644 libsm/t-streq.c > create mode 100755 libsm/t-streq.sh > create mode 100644 libsm/utf8_valid.c > create mode 100644 libsm/uxtext_unquote.c > create mode 100644 libsm/xleni.c > create mode 100755 libsmutil/t-lockfile-0.sh > create mode 100644 libsmutil/t-lockfile.c > create mode 100755 libsmutil/t-maplock-0.sh >> git tag -a -m "Tag sendmail 8.17.1" vendor/sendmail/8.17.1 >> git push --dry-run --follow-tags freebsd vendor/sendmail > error: src refspec vendor/sendmail does not match any > error: failed to push some refs to 'gitrepo.freebsd.org:src.git' > > Note that the output to git commit above starts with "[detached HEAD > ...]" which, along with the git status issue described above, looks > suspicious. You should create a branch in your worktree. This will probably do what you want: git checkout -b vendor/sendmail I believe this will put the HEAD of that branch on the commit you made, but this is untested. git reset e2db8b1cc34e If that doesn't work, simply do the rsync; git add; git commit again. It's not worth fighting with git over. :) Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises