Index: head/devel/git-cinnabar/files/patch-git-2.26
===================================================================
--- head/devel/git-cinnabar/files/patch-git-2.26	(revision 532656)
+++ head/devel/git-cinnabar/files/patch-git-2.26	(nonexistent)
@@ -1,29 +0,0 @@
-https://github.com/glandium/git-cinnabar/commit/716a09de6de7
-
---- helper/cinnabar-helper.c.orig	2020-02-05 23:41:37 UTC
-+++ helper/cinnabar-helper.c
-@@ -192,7 +192,7 @@ static void send_object(const struct object_id *oid)
- 	unsigned long sz;
- 	struct git_istream *st;
- 
--	st = open_istream(oid, &type, &sz, NULL);
-+	st = open_istream(the_repository, oid, &type, &sz, NULL);
- 
- 	if (!st)
- 		die("open_istream failed for %s", oid_to_hex(oid));
-@@ -2270,6 +2270,7 @@ static void reset_replace_map()
- {
- 	oidmap_free(the_repository->objects->replace_map, 1);
- 	FREE_AND_NULL(the_repository->objects->replace_map);
-+	the_repository->objects->replace_map_initialized = 0;
- }
- 
- static void init_metadata()
-@@ -2304,6 +2305,7 @@ static void init_metadata()
- 	the_repository->objects->replace_map =
- 		xmalloc(sizeof(*the_repository->objects->replace_map));
- 	oidmap_init(the_repository->objects->replace_map, 0);
-+	the_repository->objects->replace_map_initialized = 1;
- 
- 	tree = get_commit_tree(c);
- 	parse_tree(tree);

Property changes on: head/devel/git-cinnabar/files/patch-git-2.26
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/git-cinnabar/files/patch-git-2.25.2
===================================================================
--- head/devel/git-cinnabar/files/patch-git-2.25.2	(revision 532656)
+++ head/devel/git-cinnabar/files/patch-git-2.25.2	(nonexistent)
@@ -1,30 +0,0 @@
---- helper/notes.c.patch.orig	2020-02-05 23:41:37 UTC
-+++ helper/notes.c.patch
-@@ -14,10 +14,10 @@ index 75c028b300..24089afa8a 100644
-  			if (hex_to_bytes(object_oid.hash + prefix_len, entry.path,
-  					 hashsz - prefix_len))
-  				goto handle_non_note; /* entry.path is not a SHA1 */
--@@ -722,6 +719,7 @@ static int write_each_note_helper(struct tree_write_stack *tws,
-- struct write_each_note_data {
-+@@ -720,6 +720,7 @@ struct write_each_note_data {
-  	struct tree_write_stack *root;
-- 	struct non_note *next_non_note;
-+ 	struct non_note **nn_list;
-+ 	struct non_note *nn_prev;
- +	unsigned int note_mode;
-  };
-  
-@@ -41,10 +41,10 @@ index 75c028b300..24089afa8a 100644
-  {
-  	struct tree_write_stack root;
-  	struct write_each_note_data cb_data;
--@@ -1143,6 +1142,7 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
-- 	root.path[0] = root.path[1] = '\0';
-+@@ -1178,6 +1179,7 @@ int write_notes_tree_mode(struct notes_tree *t, struct
-  	cb_data.root = &root;
-- 	cb_data.next_non_note = t->first_non_note;
-+ 	cb_data.nn_list = &(t->first_non_note);
-+ 	cb_data.nn_prev = NULL;
- +	cb_data.note_mode = mode;
-  
-  	/* Write tree objects representing current notes tree */

Property changes on: head/devel/git-cinnabar/files/patch-git-2.25.2
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/git-cinnabar/Makefile
===================================================================
--- head/devel/git-cinnabar/Makefile	(revision 532656)
+++ head/devel/git-cinnabar/Makefile	(revision 532657)
@@ -1,51 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	git-cinnabar
-DISTVERSION=	0.5.4
-PORTREVISION=	3
+DISTVERSION=	0.5.5
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Git remote helper to interact with Mercurial repositories
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${NONEXISTENT}:devel/git:configure
 RUN_DEPENDS=	git:devel/git \
 		hg:devel/mercurial
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glandium
 
 USES=		gmake python:2.7,run shebangfix
 SHEBANG_LANG=	python2.7
 SHEBANG_FILES=	${PORTNAME} git-remote-hg
 ALL_TARGET=	${PORTNAME}-helper
 .ifnmake describe
 MAKE_ENV!=	${MAKE} -V MAKE_ENV -C ${.CURDIR}/../git
 MAKE_ARGS!=	${MAKE} -V MAKE_ARGS -C ${.CURDIR}/../git
 .endif
 MAKE_ENV+=	PYTHON_PATH="${PYTHON_CMD}"
 MAKE_ARGS+=	SUBMODULE_STATUS=dummy
 DATADIR=	${PREFIX}/libexec/git-core
 PORTDATA=	*
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-configure:
 	@${TAR} cf - -C$$(${MAKE} -V WRKSRC -C ${PORTSDIR}/devel/git) . | \
 		${TAR} xof - -C${WRKSRC}/git-core
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${WRKSRC}/git-remote-hg \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/git-core/${PORTNAME}-helper \
 		${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTNAME:S/git-//}" \
 		${STAGEDIR}${DATADIR}/pythonlib)
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/devel/git-cinnabar/distinfo
===================================================================
--- head/devel/git-cinnabar/distinfo	(revision 532656)
+++ head/devel/git-cinnabar/distinfo	(revision 532657)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580946097
-SHA256 (glandium-git-cinnabar-0.5.4_GH0.tar.gz) = 11980dc0d4d7a291930e4c7f7f4a3f2086fac0f0c9d7cd1dee0292cb0e245010
-SIZE (glandium-git-cinnabar-0.5.4_GH0.tar.gz) = 176038
+TIMESTAMP = 1587622573
+SHA256 (glandium-git-cinnabar-0.5.5_GH0.tar.gz) = 7e0a935966ab5b434f4c60335808be167e4b300d8cb0b0feb987adb7fc562521
+SIZE (glandium-git-cinnabar-0.5.5_GH0.tar.gz) = 175208