Date: Thu, 31 Dec 2020 17:53:09 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559758 - in head/devel/git-cinnabar: . files Message-ID: <202012311753.0BVHr9UK092362@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Dec 31 17:53:09 2020 New Revision: 559758 URL: https://svnweb.freebsd.org/changeset/ports/559758 Log: devel/git-cinnabar: unbreak after r559755 helper/cinnabar-helper.c:1981:3: warning: implicit declaration of function 'hashmap_free_entries' is invalid in C99 [-Wimplicit-function-declaration] hashmap_free_entries(&track.commit_cache, struct oid_map_entry, ent); ^ helper/cinnabar-helper.c:1981:45: error: expected expression hashmap_free_entries(&track.commit_cache, struct oid_map_entry, ent); ^ helper/cinnabar-helper.c:1981:67: error: use of undeclared identifier 'ent' hashmap_free_entries(&track.commit_cache, struct oid_map_entry, ent); ^ helper/cinnabar-helper.c:1982:43: error: expected expression hashmap_free_entries(&track.tree_cache, struct oid_map_entry, ent); ^ helper/cinnabar-helper.c:1982:65: error: use of undeclared identifier 'ent' hashmap_free_entries(&track.tree_cache, struct oid_map_entry, ent); ^ helper/cinnabar-helper.c:2374:2: warning: implicit declaration of function 'hashmap_free_entries' is invalid in C99 [-Wimplicit-function-declaration] hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); ^ helper/cinnabar-helper.c:2374:40: error: expected expression hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); ^ helper/cinnabar-helper.c:2374:62: error: use of undeclared identifier 'ent' hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); ^ helper/cinnabar-helper.c:2577:2: warning: implicit declaration of function 'hashmap_free_entries' is invalid in C99 [-Wimplicit-function-declaration] hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); ^ helper/cinnabar-helper.c:2577:40: error: expected expression hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); ^ helper/cinnabar-helper.c:2577:62: error: use of undeclared identifier 'ent' hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); ^ PR: 252244 Added: head/devel/git-cinnabar/files/patch-git-2.30 (contents, props changed) Modified: head/devel/git-cinnabar/Makefile (contents, props changed) Modified: head/devel/git-cinnabar/Makefile ============================================================================== --- head/devel/git-cinnabar/Makefile Thu Dec 31 17:17:10 2020 (r559757) +++ head/devel/git-cinnabar/Makefile Thu Dec 31 17:53:09 2020 (r559758) @@ -2,6 +2,7 @@ PORTNAME= git-cinnabar DISTVERSION= 0.5.6 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org Added: head/devel/git-cinnabar/files/patch-git-2.30 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/git-cinnabar/files/patch-git-2.30 Thu Dec 31 17:53:09 2020 (r559758) @@ -0,0 +1,49 @@ +https://github.com/glandium/git-cinnabar/commit/2db9fad6a3df + +--- helper/GIT-VERSION.mk.orig 2020-11-12 02:19:34 UTC ++++ helper/GIT-VERSION.mk +@@ -1,2 +1,2 @@ +-GIT_VERSION ?= v2.29.2 ++GIT_VERSION ?= v2.30.0 + WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1 +--- helper/cinnabar-fast-import.c.orig 2020-11-12 02:19:34 UTC ++++ helper/cinnabar-fast-import.c +@@ -264,7 +264,7 @@ static uintmax_t parse_mark_ref(const char *p, char ** + e->pack_id = MAX_PACK_ID; + e->idx.offset = 1; + } +- insert_mark(marks, 2, e); ++ insert_mark(&marks, 2, e); + return 2; + } + +--- helper/cinnabar-helper.c.orig 2020-11-12 02:19:34 UTC ++++ helper/cinnabar-helper.c +@@ -1978,8 +1978,8 @@ static void do_upgrade(struct string_list *args) + free_tree_buffer(get_commit_tree(manifest_commit)); + } + } +- hashmap_free_entries(&track.commit_cache, struct oid_map_entry, ent); +- hashmap_free_entries(&track.tree_cache, struct oid_map_entry, ent); ++ hashmap_clear_and_free(&track.commit_cache, struct oid_map_entry, ent); ++ hashmap_clear_and_free(&track.tree_cache, struct oid_map_entry, ent); + oidset_clear(&track.manifests); + stop_progress(&track.progress); + } +@@ -2371,7 +2371,7 @@ static void do_reload(struct string_list *args) + + oidset_clear(&hg2git_seen); + +- hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); ++ hashmap_clear_and_free(&git_tree_cache, struct oid_map_entry, ent); + hashmap_init(&git_tree_cache, oid_map_entry_cmp, NULL, 0); + + oid_array_clear(&manifest_heads); +@@ -2574,6 +2574,6 @@ int main(int argc, const char *argv[]) + free_notes(&files_meta); + + oidset_clear(&hg2git_seen); +- hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); ++ hashmap_clear_and_free(&git_tree_cache, struct oid_map_entry, ent); + return 0; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012311753.0BVHr9UK092362>