diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-12-31 17:53:09 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-12-31 17:53:09 +0000 |
| commit | 60fbcf792a543ab5309d00342aedb20f999d04ca (patch) | |
| tree | 6d882d0917de28a38fd8ba6cfdb2afba2169c4e2 /devel/git-cinnabar | |
| parent | c046e95ebd6762238b01576ec306a060071f4fb8 (diff) | |
| download | ports-60fbcf792a543ab5309d00342aedb20f999d04ca.tar.gz ports-60fbcf792a543ab5309d00342aedb20f999d04ca.zip | |
Notes
Diffstat (limited to 'devel/git-cinnabar')
| -rw-r--r-- | devel/git-cinnabar/Makefile | 1 | ||||
| -rw-r--r-- | devel/git-cinnabar/files/patch-git-2.30 | 49 |
2 files changed, 50 insertions, 0 deletions
diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile index 6a68140a3db9..c535b3b9b54c 100644 --- a/devel/git-cinnabar/Makefile +++ b/devel/git-cinnabar/Makefile @@ -2,6 +2,7 @@ PORTNAME= git-cinnabar DISTVERSION= 0.5.6 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/git-cinnabar/files/patch-git-2.30 b/devel/git-cinnabar/files/patch-git-2.30 new file mode 100644 index 000000000000..9e8e3f197447 --- /dev/null +++ b/devel/git-cinnabar/files/patch-git-2.30 @@ -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; + } |