From owner-freebsd-git@freebsd.org Sat Nov 28 11:44:55 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9277447E0E7 for ; Sat, 28 Nov 2020 11:44:55 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CjqRW3g96z3lCc for ; Sat, 28 Nov 2020 11:44:55 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id 7DC2E47DFAE; Sat, 28 Nov 2020 11:44:55 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7D8D947E0E6 for ; Sat, 28 Nov 2020 11:44:55 +0000 (UTC) (envelope-from dim@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CjqRW35Jxz3l9P; Sat, 28 Nov 2020 11:44:55 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:470:7a58:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 433277869; Sat, 28 Nov 2020 11:44:55 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:470:7a58::f905:f952:d44c:7855] (unknown [IPv6:2001:470:7a58:0:f905:f952:d44c:7855]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id DD7B848373; Sat, 28 Nov 2020 12:44:53 +0100 (CET) From: Dimitry Andric Message-Id: <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> Content-Type: multipart/signed; boundary="Apple-Mail=_46B02821-0368-4A99-AC86-58D7E7FEEE42"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.17\)) Subject: Re: cgit-beta ports repository diverged? Date: Sat, 28 Nov 2020 12:44:49 +0100 In-Reply-To: <20201128113854.GA12390@freefall.freebsd.org> Cc: git@freebsd.org To: Rene Ladan References: <20201128113854.GA12390@freefall.freebsd.org> X-Mailer: Apple Mail (2.3445.104.17) X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Nov 2020 11:44:55 -0000 --Apple-Mail=_46B02821-0368-4A99-AC86-58D7E7FEEE42 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 28 Nov 2020, at 12:38, Rene Ladan wrote: > > I just noticed that after doing a 'git pull' that the ports repository > at cgit-beta seems to have diverged: > > rene@e17:/usr/freebsd/cgit-beta/ports % git status > On branch main > Your branch and 'origin/main' have diverged, > and have 546213 and 528036 different commits each, respectively. > (use "git pull" to merge the remote branch into yours) > > It took 5.85 seconds to compute the branch ahead/behind values. > You can use '--no-ahead-behind' to avoid this. > > nothing to commit, working tree clean > rene@e17:/usr/freebsd/cgit-beta/ports % git fetch > rene@e17:/usr/freebsd/cgit-beta/ports % git pull > fatal: refusing to merge unrelated histories > rene@e17:/usr/freebsd/cgit-beta/ports % > > and what happened to those 18000 commits? I think you just missed Ulrich's heads-up mail :-) https://lists.freebsd.org/pipermail/freebsd-git/2020-November/000505.html -Dimitry --Apple-Mail=_46B02821-0368-4A99-AC86-58D7E7FEEE42 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCX8I4MQAKCRCwXqMKLiCW ozMDAJ49+xbIGbST+Bf7o7qghMmrVcJN+QCg0Ua8JqDwIvvM3iPv9IZYdreVMOQ= =X3xA -----END PGP SIGNATURE----- --Apple-Mail=_46B02821-0368-4A99-AC86-58D7E7FEEE42--