Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DEC7C84F1A for ; Fri, 6 Oct 2023 10:20:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id GNeZqdbnrVOD for ; Fri, 6 Oct 2023 10:20:19 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4BEBC84D01 for ; Fri, 6 Oct 2023 10:20:19 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4346DFBDB; Fri, 6 Oct 2023 10:20:19 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1696587619208280" MIME-Version: 1.0 Date: Fri, 6 Oct 2023 10:20:19 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/devel/git-cinnabar To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20231006102019.4346DFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1696587619208280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Fri Oct 6 10:20:19 UTC 2023 Modified Files: pkgsrc/devel/git-cinnabar: Makefile distinfo Added Files: pkgsrc/devel/git-cinnabar/patches: patch-src_cinnabar-fast-import.c Log Message: git-cinnabar: Backport upstream patch to 0.6.2. Fixes clone of xsrc. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/git-cinnabar/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/git-cinnabar/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/git-cinnabar/patches/patch-src_cinnabar-fast-import.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1696587619208280 Content-Disposition: inline Content-Length: 2744 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/git-cinnabar/Makefile diff -u pkgsrc/devel/git-cinnabar/Makefile:1.5 pkgsrc/devel/git-cinnabar/Makefile:1.6 --- pkgsrc/devel/git-cinnabar/Makefile:1.5 Fri Oct 6 10:19:56 2023 +++ pkgsrc/devel/git-cinnabar/Makefile Fri Oct 6 10:20:18 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2023/10/06 10:19:56 riastradh Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/06 10:20:18 riastradh Exp $ DISTNAME= git-cinnabar-0.6.2 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=glandium/} # does not contain the git submodules, please update GITHUB_SUBMODULES below Index: pkgsrc/devel/git-cinnabar/distinfo diff -u pkgsrc/devel/git-cinnabar/distinfo:1.4 pkgsrc/devel/git-cinnabar/distinfo:1.5 --- pkgsrc/devel/git-cinnabar/distinfo:1.4 Fri Oct 6 10:19:56 2023 +++ pkgsrc/devel/git-cinnabar/distinfo Fri Oct 6 10:20:18 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2023/10/06 10:19:56 riastradh Exp $ +$NetBSD: distinfo,v 1.5 2023/10/06 10:20:18 riastradh Exp $ BLAKE2s (addr2line-0.20.0.crate) = 325dbd01710a578526165bf191bc3df1e1b7afa6492f90662ecb33b2c2643d2d SHA512 (addr2line-0.20.0.crate) = f9794772a31dd01096b168b4b4ffe311d4850c69fd77dd72c1e532a94ef7b23c31cccb9033848822521510f1fcc2ad0fdd824cf7efb9ed43828dc0165165b319 @@ -330,3 +330,4 @@ Size (zstd-safe-6.0.5+zstd.1.5.4.crate) BLAKE2s (zstd-sys-2.0.8+zstd.1.5.5.crate) = 6b0ec4a18acadf02653ceb28a5d25cac6314c8b457f722c5ff8d8df17bf171ec SHA512 (zstd-sys-2.0.8+zstd.1.5.5.crate) = acfbf6c464678438bcab289c8be2e67a2bdfb910143d77363bf1ad5227dffc4b60e224388b7e59186fd4d1e017b63fef49734e99e383cbda19b82b4ed382fcd8 Size (zstd-sys-2.0.8+zstd.1.5.5.crate) = 736270 bytes +SHA1 (patch-src_cinnabar-fast-import.c) = deff3f60be790748c64708c637c8a23119765e01 Added files: Index: pkgsrc/devel/git-cinnabar/patches/patch-src_cinnabar-fast-import.c diff -u /dev/null pkgsrc/devel/git-cinnabar/patches/patch-src_cinnabar-fast-import.c:1.1 --- /dev/null Fri Oct 6 10:20:19 2023 +++ pkgsrc/devel/git-cinnabar/patches/patch-src_cinnabar-fast-import.c Fri Oct 6 10:20:19 2023 @@ -0,0 +1,16 @@ +$NetBSD: patch-src_cinnabar-fast-import.c,v 1.1 2023/10/06 10:20:19 riastradh Exp $ + +https://github.com/glandium/git-cinnabar/issues/315 +https://github.com/glandium/git-cinnabar/commit/d81234ae36a090477ce298342a871c8f341e8b7a + +--- src/cinnabar-fast-import.c.orig 2023-07-09 20:08:20.000000000 +0000 ++++ src/cinnabar-fast-import.c +@@ -1014,7 +1014,7 @@ const struct object_id *ensure_empty_tre + if (!oe) { + struct object_id hash; + struct strbuf buf = STRBUF_INIT; +- store_object(OBJ_BLOB, &buf, NULL, &hash, 0); ++ store_object(OBJ_TREE, &buf, NULL, &hash, 0); + assert(oidcmp(&hash, &empty_tree) == 0); + } + return &empty_tree; --_----------=_1696587619208280--