From nobody Thu Apr 21 00:07:01 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 1019013A37BA; Thu, 21 Apr 2022 00:07:02 +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 4KkHsK70qHz3wCC; Thu, 21 Apr 2022 00:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650499622; 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=4pzVjkeMHbu82RMaWaTdcNRhBsJOTcd1HURwvadDvls=; b=uQZ2DaOnH+zo4BOkD+BIKAN6/O7+37JXdQuIrqEHCU8LmGvlHlgNnvMU0I0dV8ujcgJKcJ zaor/EGSSV6vghh0S91BiUpwij/n3F0x97nvD5DrYELJ97m4F6WOf95D0n6b/k1Czh5V2n dZuoRwjT4F2+W8IsoqkyfEW6T4cqasYHFqZg4xlv/5lhOt1wl6Fk01W+2QcKfGr+HRnYv4 +jMNOzHvzRawLu/5pA4j99upPleXgejgq0tptAci3ibwq1wuB+rOIxmE1UJEuTk0JV7Feg 6ZefM3mYgLZG8LfV93msx9C/seFOqHJrjcV1Rg3W5joa7yA8k235mpEQtuTU+Q== 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 C91E51DCCD; Thu, 21 Apr 2022 00:07:01 +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 23L0717t095149; Thu, 21 Apr 2022 00:07:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23L071SE095148; Thu, 21 Apr 2022 00:07:01 GMT (envelope-from git) Date: Thu, 21 Apr 2022 00:07:01 GMT Message-Id: <202204210007.23L071SE095148@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 66c655dd04ae - main - devel/git-cinnabar: unbreak after c472db1cb7c6 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66c655dd04ae5a595a2218503d588c33973570ec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650499622; 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=4pzVjkeMHbu82RMaWaTdcNRhBsJOTcd1HURwvadDvls=; b=r82DOXbVJXcuC0Twy2tDo6Lf8oWtM8F8ZkZ6ci59E5XbOZMVis+MwMlqb6E8bkyRM01/DV MBL+le8AzkgBNYHJU+wJSl96u8YBp0o85YmQMnQbi0rkHCq7Iq16FzgqeOcJ+nZUjTUjL0 N7JTCEsrhKvXzGPtYHFqDzYobmaymxjbci+scsa9nCWFxjsapCD+1pWck+z3KVyp84epax SmszG8/OsKz8P2+gITAuBJfQ1cHZvlquWvwnOcJLZTRgtICIR40sEb3URVZRtvHoZlz+Qo lV5aEaf24XS0AdptKPoWX6h8XBTTF6jl2KxUh/6yeQdp7AA8DkQO2GlLxKiedA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650499622; a=rsa-sha256; cv=none; b=HAqxZ67I3FS5qPppmM+Tnz+x2EbcZqHTVRQY5LTeM2tAMZIi5sg09dPXHlPy0GIBCYib/f +SpAlbDHl+Gu5oUa/AuBznbMpg2ymVFVpkndPJ3bgGnkLri4SoXujKbOICLDybPiNotecT 86oAUkv2qKtwb8m9vM8xBOyPaXx56Unaz8CgRc0+eWGi89JPTn7Ivsx+u04rcTcHCyVPMu zVAElxx2BU/ndIbMB5raFFFQuPrBWeNKqyY6gwcxdN28HwqwjVWJ2HceUJmsfBKraLcEyb nDiq2WHDXfW5331Mu71irMAgOPeyFsp+znApWDJKlmQ6WZ75mYbL+Dv0sYxK0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=66c655dd04ae5a595a2218503d588c33973570ec commit 66c655dd04ae5a595a2218503d588c33973570ec Author: Jan Beich AuthorDate: 2022-04-20 23:58:56 +0000 Commit: Jan Beich CommitDate: 2022-04-21 00:05:58 +0000 devel/git-cinnabar: unbreak after c472db1cb7c6 patch -p1 -F0 -o helper/fast-import.patched.c git-core/builtin/fast-import.c < helper/fast-import.c.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/builtin/fast-import.c b/builtin/fast-import.c |index 20406f6775..7ff0911c2c 100644 |--- a/builtin/fast-import.c |+++ b/builtin/fast-import.c -------------------------- Patching file git-core/builtin/fast-import.c using Plan A... Hunk #1 failed at 19. Hunk #2 succeeded at 747 (offset 9 lines). Hunk #3 succeeded at 848 (offset 9 lines). Hunk #4 failed at 867. Hunk #5 succeeded at 967 (offset 9 lines). Hunk #6 succeeded at 1653 (offset 9 lines). Hunk #7 succeeded at 2222 (offset 9 lines). Hunk #8 succeeded at 2288 (offset 9 lines). 2 out of 8 hunks failed--saving rejects to helper/fast-import.patched.c.rej done --- devel/git-cinnabar/Makefile | 2 +- devel/git-cinnabar/files/patch-git-2.36 | 131 ++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 1 deletion(-) diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile index 94395a78752b..73d6780446d5 100644 --- a/devel/git-cinnabar/Makefile +++ b/devel/git-cinnabar/Makefile @@ -1,6 +1,6 @@ PORTNAME= git-cinnabar DISTVERSION= 0.5.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/git-cinnabar/files/patch-git-2.36 b/devel/git-cinnabar/files/patch-git-2.36 new file mode 100644 index 000000000000..89144ecdc2bf --- /dev/null +++ b/devel/git-cinnabar/files/patch-git-2.36 @@ -0,0 +1,131 @@ +https://github.com/glandium/git-cinnabar/commit/16d11703acfe + +--- helper/GIT-VERSION.mk.orig 2021-11-19 21:23:13 UTC ++++ helper/GIT-VERSION.mk +@@ -1,2 +1,2 @@ +-GIT_VERSION ?= v2.35.1 ++GIT_VERSION ?= v2.36.0 + WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1 +--- helper/cinnabar-fast-import.c.orig 2021-11-19 21:23:13 UTC ++++ helper/cinnabar-fast-import.c +@@ -523,30 +523,18 @@ static void do_set(struct string_list *args) + } + + #ifdef _WIN32 +-int write_object_file_flags(const void *buf, size_t len, const char *type, ++int write_object_file_flags(const void *buf, size_t len, enum object_type type, + struct object_id *oid, unsigned flags) + #else +-int write_object_file_flags(const void *buf, unsigned long len, const char *type, ++int write_object_file_flags(const void *buf, unsigned long len, enum object_type type, + struct object_id *oid, unsigned flags) + #endif + { + struct strbuf data; +- enum object_type t; +- if (type == tree_type) { +- t = OBJ_TREE; +- } else if (type == blob_type) { +- t = OBJ_BLOB; +- } else if (type == commit_type) { +- t = OBJ_COMMIT; +- } else if (type == tag_type) { +- t = OBJ_TAG; +- } else { +- die("Unknown type"); +- } + data.buf = (void *)buf; + data.len = len; + data.alloc = len; +- store_object(t, &data, NULL, oid, 0); ++ store_object(type, &data, NULL, oid, 0); + return 0; + } + +--- helper/fast-import.c.patch.orig 2021-11-19 21:23:13 UTC ++++ helper/fast-import.c.patch +@@ -1,16 +1,25 @@ diff --git a/builtin/fast-import.c b/builtin/fast-impo + diff --git a/builtin/fast-import.c b/builtin/fast-import.c +-index 20406f6775..7ff0911c2c 100644 ++index 28d3193c38..2b3aeaa4d5 100644 + --- a/builtin/fast-import.c + +++ b/builtin/fast-import.c +-@@ -19,6 +19,7 @@ +- #include "mem-pool.h" ++@@ -20,6 +20,7 @@ + #include "commit-reach.h" + #include "khash.h" ++ #include "date.h" + +#include "shallow.h" + + #define PACK_ID_BITS 16 + #define MAX_PACK_ID ((1<pack_fd, pack_data->hash, + pack_data->pack_name, object_count, + cur_pack_oid.hash, pack_size); +-@@ -956,6 +958,9 @@ static int store_object( ++@@ -965,6 +967,9 @@ static int store_object( + e->pack_id = MAX_PACK_ID; + e->idx.offset = 1; /* just not zero! */ + duplicate_count_by_type[type]++; +@@ -46,7 +55,7 @@ + } + return 1; + } + +-@@ -1639,7 +1644,7 @@ static int update_branch(struct branch *b) ++@@ -1648,7 +1653,7 @@ static int update_branch(struct branch *b) + return 0; + } + +@@ -55,7 +64,7 @@ +void dump_branches(void) + { + unsigned int i; + struct branch *b; +-@@ -2208,7 +2213,9 @@ static int parse_mapped_oid_hex(const char *hex, struct object_id *oid, const ch ++@@ -2217,7 +2222,9 @@ static int parse_mapped_oid_hex(const char *hex, struct object_id *oid, const ch + * Complain if the following character is not what is expected, + * either a space or end of the string. + */ +@@ -66,7 +75,7 @@ +static uintmax_t real_parse_mark_ref(const char *p, c + { + uintmax_t mark; + +-@@ -2272,9 +2279,8 @@ static void file_change_m(const char *p, struct branch *b) ++@@ -2281,9 +2288,8 @@ static void file_change_m(const char *p, struct branch *b) + case S_IFDIR: + case S_IFGITLINK: + /* ok */