From owner-freebsd-git@freebsd.org Sat Nov 28 13:40:45 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 822B34A1B81 for ; Sat, 28 Nov 2020 13:40:45 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cjt192tg1z3qxw for ; Sat, 28 Nov 2020 13:40:45 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 615C14A1A86; Sat, 28 Nov 2020 13:40:45 +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 612174A14F1 for ; Sat, 28 Nov 2020 13:40:45 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cjt192Nx4z3r50; Sat, 28 Nov 2020 13:40:45 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606570845; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OPcjUbA2ZG18ZcTTuuwDGmewytjTebGr5Rp4nCUcZ5M=; b=jUHc9945JAfVqmllAdpDiQqdzU88U8TN5oJKEJmokKmAanLEHc46EPo5ISuiyhD2RnOre6 Hwc4hzHHPZirs5zt2NSvaliTB15k5txHjSUr/Gj2LJd/vG+J8VwKWAUNOXT4Xs1Cw8+0v1 6Xvx/6/khxtYrq3dlqht8cjB+WHG3NYF4I7IoHNiCkxFV1bkYmd1hBjnB+BnBQDg28Lku7 fwPzWmA8dF5CR5qTKg/a8fYdXelAaOb0ivJ3kRuWF2rBrMitrhV7sgPNgYhOyXA/cR77Nz qj4OVeq2CoAffjAkL6JcZsUSitVMF4054p5FNLS6y0QjV4IWhAaJiofr0dS8FA== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 48710195F2; Sat, 28 Nov 2020 13:40:45 +0000 (UTC) Date: Sat, 28 Nov 2020 13:40:45 +0000 From: Rene Ladan To: Dimitry Andric Cc: git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: <20201128134045.GA35756@freefall.freebsd.org> References: <20201128113854.GA12390@freefall.freebsd.org> <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606570845; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OPcjUbA2ZG18ZcTTuuwDGmewytjTebGr5Rp4nCUcZ5M=; b=LXdyb4/CgtpZnbY/pSFgBFphaYN6+S+jkQ1P+kLIwvU1qc/UaPL6+ktGEGmrjcFiW64SvH qvuNrLoxfpvl+qLiQh+ya/rO2uqIv6y5IDsXSglmAmM2UOuD6aAj11w8JPR50tM3hz+1zj 6w9uIKY5KA3JuaZe+d5qEBIFqIv/s3W2lsxItT8F08cwoPQAbLHIy6OvTzzLLRKS5QJa+f KgWFcnbPhABFB1kAkK+xrTnDfRayLKOEQQTGBAiUh0QkpFqewKLiJDoFBMxaFRu1PUfA8L 5oXOvJ7NzQgwLuYKOG5790svI9Ci+vdylso8OzOUL7a8Z9WDzHlTcfnKc58NQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606570845; a=rsa-sha256; cv=none; b=qPXMiLxsn9TXVQvboobvJWjLjGN5unTEbS6oq2I0lt7b6o/AVm6hEHbat2xC+wv2ItHbpj lJzk5M6sjytL7ZV/716PBnvVCI2fRKgM5bnApyRkzzrAtPJL97m5it7Tm7DriQiasVsaUB kwCGPnq+caEDhb7llRlWzcACN47ZBV9aJi4Axn/TuQpFqJLy02I0kDkQJBP8DRVm3h8nTC uFH1/5BxdfJf7Jwa7hwZZ1j/oRcsfIpn93Eb/rFgoq4upg35ZBK5dP/YF3Gi5NVJsyqY4Z JlvcQjiYy8YCwCxTy1NW+4H3rBUCA/9OZgbenkCcar9GIDvESf5M5BZJmC2VFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 13:40:45 -0000 On Sat, Nov 28, 2020 at 12:44:49PM +0100, Dimitry Andric wrote: > 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 > Yes, I was a bit too fast noticing myself ;) René