From owner-freebsd-git@freebsd.org Sat Nov 28 11:38:54 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 AC99C47DF0B for ; Sat, 28 Nov 2020 11:38:54 +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 4CjqJZ4Jrnz3kdn for ; Sat, 28 Nov 2020 11:38:54 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 9211A47DE0A; Sat, 28 Nov 2020 11:38:54 +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 90AC847DD52 for ; Sat, 28 Nov 2020 11:38:54 +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 4CjqJZ3VSBz3kxn for ; Sat, 28 Nov 2020 11:38:54 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606563534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EiE05IsAJ+tyM+mqdPq3Q8MEmg+3aDY031SqsBKlG70=; b=LDQFT3dEbYUSG16eKEoGuWU6z9UPqcrzbnLSP1ZbLGsSneyAqjFDO96Y0D/BnLPViASg+c jnOPyqdPVUdOvQXY8al3Z19SW6HzJJv6qYaZJJUsH/+8ou1Xz7Q/LD1rehTsKmMLBzSA2U z9T3oAhuE2nTgANZWwG83eYjGc/lsgSA4re44dOq/fyWmEaXdxHUJ+F/Y+uIdMB7vjNU72 RU7AHDCC5y7ybpulufod2cunLs66I6DVdN63g3njolAIIT5SFoobyM3VQpFKT8LdA9cfvf BYDSvI0rtPrT1CqKa/8c/ekjxE8ntdzogCXAIeYDaXWn4fbKudOxVlDsjej6DQ== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 68DBF189F2; Sat, 28 Nov 2020 11:38:54 +0000 (UTC) Date: Sat, 28 Nov 2020 11:38:54 +0000 From: Rene Ladan To: git@freebsd.org Subject: cgit-beta ports repository diverged? Message-ID: <20201128113854.GA12390@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606563534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EiE05IsAJ+tyM+mqdPq3Q8MEmg+3aDY031SqsBKlG70=; b=XO/1x4lak8WUIot4zJDGnDbz2myqnntKc+B8zHxVV2yldqEgjjeiVJBSP3dmuxwRC90BqC U/F3ElUDWqDkqCWeDBJN/EC4ZKa4dcIcGrbLgwALptqrZMx2Suf4l9eudwNH7ec9MMxGGm EZSW5c9ruZvFVtfwHigqHhe+4N0oLy1zTV4tHWmnii+opQjz/EvB27zA22fVQdPOXJoiZj mdQB4R1yQ+8kGVbUycRsW1E9qGWVdcx9awIWppyl10hrGDaDEHO5+x/T3KIp6hVAMqyyLY xPuTHOlzIJ5hrGY9USHgxkBPru3KPJk/K2Fw7JGKIMm+bUmkVftf5XGpO70V1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606563534; a=rsa-sha256; cv=none; b=yrDD0ERuWRCRnrHUPeN0V2+Byao6IMTZrMutG1exlyUwVtyvn0bmGvRpfNE/6gcKsWw6bg Gh/xPgrruyxophNPH+jTLgBLwUOm3bk/qyh4DpoLtf5TokcNBN2l+njCmqxB57nSfno93p mxyUCqPEfQsc++NhkJyV+iP8sz51R8O56n1sSTqagvwSbfpD+B6J8+ihtl/lQPzqI+K4AV zc36p0eYuC6j0Pbst4pHprz7xiK7zADTyxVS57v9Grm8gWVi4Yya63+5QvKVkz85RnHune ersD+buZqvd7pb9SvLpVcxFzlE+5B6I4b5SbqG+MFhMSMLE8CL1lGZik4PG9jg== 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 11:38:54 -0000 Hello, 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? René