From nobody Mon Jan 09 02:31:26 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 4Nqycr441Lz2pNQr for ; Mon, 9 Jan 2023 02:31:40 +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 4Nqycq5lkRz42Kc for ; Mon, 9 Jan 2023 02:31:39 +0000 (UTC) (envelope-from gshapiro@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 2001:bc8:2e97:100::100 is neither permitted nor denied by domain of gshapiro@freebsd.org) smtp.mailfrom=gshapiro@freebsd.org; dmarc=none Received: from thornystick.local ([IPv6:2601:647:5d00:1ac0:f02f:286e:4a6:5c9b]) (authenticated bits=0) by zim.gshapiro.net (8.17.0.4/8.17.0.4) with ESMTPSA id 3092VR8g088772 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 9 Jan 2023 02:31:29 GMT Date: Sun, 8 Jan 2023 18:31:26 -0800 From: Gregory Shapiro To: freebsd-git@freebsd.org Subject: Vendor import push failed: src refspec ... does not match any Message-ID: <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=us-ascii Content-Disposition: inline X-Spamd-Result: default: False [-3.04 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.94)[-0.943]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; ASN(0.00)[asn:12876, ipnet:2001:bc8::/32, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; R_SPF_SOFTFAIL(0.00)[~all:c]; FREEFALL_USER(0.00)[gshapiro]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DOM_EQ_FROM_DOM(0.00)[] X-Rspamd-Queue-Id: 4Nqycq5lkRz42Kc X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N 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.