From owner-freebsd-git@freebsd.org Sat Nov 28 11:46:37 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 12DF947E1C4 for ; Sat, 28 Nov 2020 11:46:37 +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 4CjqTS6v3sz3lJm for ; Sat, 28 Nov 2020 11:46:36 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id ECA0B47DFE4; Sat, 28 Nov 2020 11:46:36 +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 EC66E47E1C3 for ; Sat, 28 Nov 2020 11:46:36 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 4CjqTS6N7kz3ktp for ; Sat, 28 Nov 2020 11:46:36 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606563996; 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: in-reply-to:in-reply-to:references:references; bh=pvIoUmRwPNKgn6VAH//L/RIbSHRRSIb7VjDcTdwC3fA=; b=ocl8h9NajN2w9RYL/b+P+8udPyENNDYxGlPoUmvH97gbmSgKOSv0Zxb0vOCo/uNgBtBT3E yLrRixU1RInMlhnKlNGahJqev9zrLp3wG/BV3kvRtHva8KEc0f7uIXFPVjMGkcXaR9rt5y dy6awrIIl+W9E+oDmZwKYZqQJsGKyHrrL8Ekoe7R+7G91ZLSPJdDiGdf0GA8admZxug4Vw dkRI464y6rp/p3mzgTyU0hyF4ZoG1rg6lPE9CpDGcPy7QqXccYK1Sj+FRbKb0RfUPTowcn Vlq442CUoSIG4y4X4d98T8MJGk50VO6M1cTUnKEIXNobrPHbAaEDNj7oCNgPXg== Received: by freefall.freebsd.org (Postfix, from userid 1185) id C27EF18D24; Sat, 28 Nov 2020 11:46:36 +0000 (UTC) Date: Sat, 28 Nov 2020 11:46:36 +0000 From: Rene Ladan To: git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: <20201128114636.GA24238@freefall.freebsd.org> References: <20201128113854.GA12390@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201128113854.GA12390@freefall.freebsd.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606563996; 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: in-reply-to:in-reply-to:references:references; bh=pvIoUmRwPNKgn6VAH//L/RIbSHRRSIb7VjDcTdwC3fA=; b=LthIy3X8BcMo+uogTi+4HuTJugx4BQP6F27uyOs4eF2GJz9r3BBKBsE0UYziES///MjJAL yKuwjS49cmUDZupykXEgoI8f4g3DVov0krltZrxLCztmq6kVsZrLEuj+TIXBT0fwhgDRtA i2YeSkluyXylsYZfwWUd5l4fAL/l11SfuYteY/06M2ZPtbwGFh+lWfzZ1zJSnCzuuvZTZZ xOO8ZAzFKsxs4uarhkU7Jo8Zr3nKSHy5Yxawaxrc/rs6Hsv4iCsfXyxMIvr8RDpHKlbTdc vDhZT45gRRySV+12RaGNLUNXoddzehuc6IPk46vDq8X9GIRY79O9eZgdW4YQ3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606563996; a=rsa-sha256; cv=none; b=vR2NiDYWfi/w4QH+RG1C+H615nwz3twP7mmKNvS0W6+QhykhkV9jvqZ5ShO+FtJVR24O+j vmZu2DHTbnqslBPlEuV1pqPQmAel8gdX/rbMsOohnzprpUqe1CHvOYoeANxq/A39TUgsIl uzP0P0LzZWSsGm+6CpVp8H96GLgb6bCk5HDF/2TuekejYwUinIctDzR6qdexbS7jSVFCNY p3vUg1Yckys76v6wIX803o/yps6kt1SJsEAbJqT/xdBMzm+ADh5+sD+QcwL9c2UzXyNmnz bERvNXtxt/vL52KK+Up1OHSxu3AfRPPRYKhjWfjl4O/jgpfkZSjyrZuOQ/2SBQ== 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:46:37 -0000 See uqs' mail... On Sat, Nov 28, 2020 at 11:38:54AM +0000, Rene Ladan wrote: > 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é > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org"