From nobody Tue Jun 07 05:14:38 2022 X-Original-To: dev-commits-ports-main@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 62EDA1BEA76E; Tue, 7 Jun 2022 05:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LHJSh27d9z3PVg; Tue, 7 Jun 2022 05:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654578884; 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=zqEGfg2WpBFruE8diuCyjAlNSxMS06lVyqb1/qZ6YUA=; b=A+LocthhRxmS8/FCp8Wz8JBBFsXnEYB2Bb44gvxT/6YLSW4TqNmHzsguIor8SsH6PRU3lu Omg41RNaQUPtXGPq/2eGjwMtkLZecrhi2GMRyzkdIO9+xFeZE71n8vyw1xTHS5v820PDZq 2cmjx/jcUGrmU/TSNWH8kaBmavxg14mrHYdoNCASQyN5GAESalbHJRlDSnDkLef55xebs7 U7S4rXRQoaPVZwNwDrnU09WEfuvXA+2oTNGzb1KYLuuDxXWCQzXXSKE3thBb/t6W5m4nbd 0//n3Fp76mClKvmLNh9Mpg1l9Ka0n3072psBrFY+z0KePkmWzZrcsLC8W5453Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1FF6614D3E; Tue, 7 Jun 2022 05:14:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2575Eci0076296; Tue, 7 Jun 2022 05:14:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2575EcKj076295; Tue, 7 Jun 2022 05:14:38 GMT (envelope-from git) Date: Tue, 7 Jun 2022 05:14:38 GMT Message-Id: <202206070514.2575EcKj076295@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 57d9640f3c36 - main - devel/git: fix bug commit-graph requires overflow generation data List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57d9640f3c3669d318865222a743652a6952ba2d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654578884; 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=zqEGfg2WpBFruE8diuCyjAlNSxMS06lVyqb1/qZ6YUA=; b=RzV/PJFXTelxnHUetN0KYXfmWCDNWbJ6oRslkmtqYuq9d1n2zaCcoQcJ/xZvOoy6De1FnH czEp/nWqjvH6U3BpS7vLO3gMgPJc4/GevtN/Q6NMnw2aNPWj2/OOKC1r9ytVwJ3yLrcChC I6m4/Jl/5nK9JdkQPnhC1awNtREPK6ErMI5RZrqVB91nDInobuqwWSUZW5FuDkAe4KoMoP qL1K8bBgRzLvDo5AgQ/ul+M5uHSsg/ROt+03wSI7QDKTEH7LZIXOJnDxvVzKyGLn2Glc1M SAShqPdpTzdIFT0wc8Q9KXB6sbzc3XW0meVWsLlA2vd0uO/GrtjqOLQE8w0mSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654578884; a=rsa-sha256; cv=none; b=Q8E8em6+gKYEub4fSu1F/60Nyrg+ZLW25o9lM+pVnh7bbb1u6TFG4XMmo9e8uLY4ZvceaY wu/rk1P6EZAblp1omZi75ktLAp1WyVSdIa0eW7T0bZyas8UfRRSl6rlWKsTh0LUKI31S/J 4YJ6rBv2vXMl5qvryqQIjBkM2yweQqVU7AcsgSOiYsCAKJAU5npPu1BxFgivXoMyMhGxIA WZe+rlaXge4dTO5weL7Dw3k4DEU+W3tzL2Hjx+nL1TIaHOpGX1rjfR1XZoHYGTPwIeVeEi KLmyAL305XLBQ1xSwdPCbi26PQspzkdB2a01lWgGR5ywUAUJ0quB3EAzX73uFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=57d9640f3c3669d318865222a743652a6952ba2d commit 57d9640f3c3669d318865222a743652a6952ba2d Author: Matthias Fechner AuthorDate: 2022-06-06 06:02:05 +0000 Commit: Matthias Fechner CommitDate: 2022-06-07 05:14:23 +0000 devel/git: fix bug commit-graph requires overflow generation data Using www/gitlab-ce I see problems that git repositories got broken. Gitlab includes some patches for the git binary they build: https://gitlab.com/gitlab-org/gitaly/-/tree/master/_support/git-patches These patches should have no impact to normal git usage but fixes some ref handling problems, like: https://gitlab.com/gitlab-org/gitaly/-/blob/master/_support/git-patches/v2.36.0.gl1/0006-refs-skip-hooks-when-deleting-uncovered-packed-refs.patch The problem got visible that at any point it can happen that the repository got broken (by merges happen) and if you try to fetch it you get: "C:\Program Files\Git\bin\git.exe" pull --progress "origin" fatal: commit-graph requires overflow generation data but has none fatal: the remote end hung up unexpectedly Done PR: 263867 Approved by: garga (maintainer) --- devel/git/Makefile | 12 ++++++++++++ devel/git/distinfo | 14 +++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index aed68e12257f..fc5ac547eb89 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -2,6 +2,7 @@ PORTNAME= git DISTVERSION= 2.36.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -10,6 +11,17 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX} +# these patches are required for gitlab (gitaly) +# without the patches repositories got broken +PATCH_SITES= https://gitlab.com/gitlab-org/gitaly/-/raw/master/_support/git-patches/v2.36.0.gl1/ +PATCHFILES= 0001-refs-extract-packed_refs_delete_refs-to-allow-contro.patch \ + 0002-refs-allow-passing-flags-when-beginning-transactions.patch \ + 0003-refs-allow-skipping-the-reference-transaction-hook.patch \ + 0004-refs-demonstrate-excessive-execution-of-the-referenc.patch \ + 0005-refs-do-not-execute-reference-transaction-hook-on-pa.patch \ + 0006-refs-skip-hooks-when-deleting-uncovered-packed-refs.patch +PATCH_DIST_STRIP= -p1 + MAINTAINER= garga@FreeBSD.org COMMENT?= Distributed source code management tool ${COMMENT_${FLAVOR}} diff --git a/devel/git/distinfo b/devel/git/distinfo index 2ad0cf54fd0e..9007ab73a9f7 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,7 +1,19 @@ -TIMESTAMP = 1652105214 +TIMESTAMP = 1654493758 SHA256 (git-2.36.1.tar.xz) = 405d4a0ff6e818d1f12b3e92e1ac060f612adcb454f6299f70583058cb508370 SIZE (git-2.36.1.tar.xz) = 7004044 SHA256 (git-manpages-2.36.1.tar.xz) = b1e6e651333283bfe2abbdf10baa858f61c5ec9d3caacb30f44888d78d964e6f SIZE (git-manpages-2.36.1.tar.xz) = 503680 SHA256 (git-htmldocs-2.36.1.tar.xz) = f2a44ee1acfc1b8e2ce9a90ae767226c862d5a6596bed0404de70fdef8e67c8d SIZE (git-htmldocs-2.36.1.tar.xz) = 1426284 +SHA256 (0001-refs-extract-packed_refs_delete_refs-to-allow-contro.patch) = c9c6b619d43ee49ac9beff22ec722a2a8a6a704a8039dc3de4dbfa1f89f77d34 +SIZE (0001-refs-extract-packed_refs_delete_refs-to-allow-contro.patch) = 5453 +SHA256 (0002-refs-allow-passing-flags-when-beginning-transactions.patch) = 95df2fc83975b5fb0f1ba871163cb9e28319639eea34d1eb5d74dd15ed64f78e +SIZE (0002-refs-allow-passing-flags-when-beginning-transactions.patch) = 6773 +SHA256 (0003-refs-allow-skipping-the-reference-transaction-hook.patch) = fa115c854db9ee7960a9b0d7a50d9e47024e84d3139bf7fe9fda1fce88766222 +SIZE (0003-refs-allow-skipping-the-reference-transaction-hook.patch) = 1981 +SHA256 (0004-refs-demonstrate-excessive-execution-of-the-referenc.patch) = c102be748305bd569a9546dffb9fb97161fb60924e7cdd9a023226b2c0b3c18c +SIZE (0004-refs-demonstrate-excessive-execution-of-the-referenc.patch) = 3143 +SHA256 (0005-refs-do-not-execute-reference-transaction-hook-on-pa.patch) = 526b06c57d0acef49feb2a456622c57ed870bfbfcfee1d4daab43a13fd0be9a0 +SIZE (0005-refs-do-not-execute-reference-transaction-hook-on-pa.patch) = 3106 +SHA256 (0006-refs-skip-hooks-when-deleting-uncovered-packed-refs.patch) = 927559891fc520dd3723eb1aad4a2ee4ab8337a14b25bf2f91502eb7904ec181 +SIZE (0006-refs-skip-hooks-when-deleting-uncovered-packed-refs.patch) = 4441