Index: head/devel/git-cinnabar/files/patch-git-2.22
===================================================================
--- head/devel/git-cinnabar/files/patch-git-2.22	(revision 505553)
+++ head/devel/git-cinnabar/files/patch-git-2.22	(nonexistent)
@@ -1,94 +0,0 @@
-https://github.com/glandium/git-cinnabar/commit/b35af295e18a
-
---- CI/tools.py.orig	2019-05-08 21:36:37 UTC
-+++ CI/tools.py
-@@ -12,7 +12,7 @@ import msys
- 
- 
- MERCURIAL_VERSION = '5.0'
--GIT_VERSION = '2.21.0'
-+GIT_VERSION = '2.22.0'
- 
- ALL_MERCURIAL_VERSIONS = (
-     '1.9.3', '2.0.2', '2.1.2', '2.2.3', '2.3.2', '2.4.2', '2.5.4',
---- helper/GIT-VERSION.mk.orig	2019-05-08 21:36:37 UTC
-+++ helper/GIT-VERSION.mk
-@@ -1,2 +1,2 @@
--GIT_VERSION ?= v2.21.0
-+GIT_VERSION ?= v2.22.0
- WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1
---- helper/cinnabar-fast-import.c.orig	2019-05-08 21:36:37 UTC
-+++ helper/cinnabar-fast-import.c
-@@ -245,7 +245,7 @@ static uintmax_t parse_mark_ref(const char *p, char **
- 	if (**endptr == ':') {
- 		char *path_end = strpbrk(++(*endptr), " \n");
- 		if (path_end) {
--			unsigned mode;
-+			unsigned short mode;
- 			char *path = xstrndup(*endptr, path_end - *endptr);
- 			if (!get_tree_entry(note, path, &git_oid, &mode))
- 				note = &git_oid;
---- helper/notes.c.patch.orig	2019-05-08 21:36:37 UTC
-+++ helper/notes.c.patch
-@@ -1,10 +1,10 @@
- diff --git a/notes.c b/notes.c
--index 7f7cc4d511..1c127dcbe0 100644
-+index 532ec37865..b1ffc4975e 100644
- --- a/notes.c
- +++ b/notes.c
--@@ -413,11 +413,6 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
-+@@ -415,11 +415,6 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
-  
-- 		if (path_len == 2 * (GIT_SHA1_RAWSZ - prefix_len)) {
-+ 		if (path_len == 2 * (hashsz - prefix_len)) {
-  			/* This is potentially the remainder of the SHA-1 */
- -
- -			if (!S_ISREG(entry.mode))
-@@ -12,9 +12,9 @@ index 7f7cc4d511..1c127dcbe0 100644
- -				goto handle_non_note;
- -
-  			if (hex_to_bytes(object_oid.hash + prefix_len, entry.path,
-- 					 GIT_SHA1_RAWSZ - prefix_len))
-+ 					 hashsz - prefix_len))
-  				goto handle_non_note; /* entry.path is not a SHA1 */
--@@ -720,6 +715,7 @@ static int write_each_note_helper(struct tree_write_stack *tws,
-+@@ -722,6 +717,7 @@ static int write_each_note_helper(struct tree_write_stack *tws,
-  struct write_each_note_data {
-  	struct tree_write_stack *root;
-  	struct non_note *next_non_note;
-@@ -22,7 +22,7 @@ index 7f7cc4d511..1c127dcbe0 100644
-  };
-  
-  static int write_each_non_note_until(const char *note_path,
--@@ -749,7 +745,7 @@ static int write_each_note(const struct object_id *object_oid,
-+@@ -751,7 +747,7 @@ static int write_each_note(const struct object_id *object_oid,
-  	struct write_each_note_data *d =
-  		(struct write_each_note_data *) cb_data;
-  	size_t note_path_len = strlen(note_path);
-@@ -31,7 +31,7 @@ index 7f7cc4d511..1c127dcbe0 100644
-  
-  	if (note_path[note_path_len - 1] == '/') {
-  		/* subtree entry */
--@@ -1124,7 +1120,8 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
-+@@ -1126,7 +1122,8 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
-  	return for_each_note_helper(t, t->root, 0, 0, flags, fn, cb_data);
-  }
-  
-@@ -41,7 +41,7 @@ index 7f7cc4d511..1c127dcbe0 100644
-  {
-  	struct tree_write_stack root;
-  	struct write_each_note_data cb_data;
--@@ -1141,6 +1138,7 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
-+@@ -1143,6 +1140,7 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
-  	root.path[0] = root.path[1] = '\0';
-  	cb_data.root = &root;
-  	cb_data.next_non_note = t->first_non_note;
-@@ -49,7 +49,7 @@ index 7f7cc4d511..1c127dcbe0 100644
-  
-  	/* Write tree objects representing current notes tree */
-  	flags = FOR_EACH_NOTE_DONT_UNPACK_SUBTREES |
--@@ -1153,6 +1151,11 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
-+@@ -1155,6 +1153,11 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
-  	return ret;
-  }
-  

Property changes on: head/devel/git-cinnabar/files/patch-git-2.22
___________________________________________________________________
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 505553)
+++ head/devel/git-cinnabar/Makefile	(revision 505554)
@@ -1,51 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	git-cinnabar
-DISTVERSION=	0.5.1
-PORTREVISION=	1
+DISTVERSION=	0.5.2
 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 505553)
+++ head/devel/git-cinnabar/distinfo	(revision 505554)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557351397
-SHA256 (glandium-git-cinnabar-0.5.1_GH0.tar.gz) = f2ade7c0b5d362eb4b9e51ca4faa7a8a200f08a62a7104c0d61cab1f6ea18b09
-SIZE (glandium-git-cinnabar-0.5.1_GH0.tar.gz) = 160417
+TIMESTAMP = 1561957068
+SHA256 (glandium-git-cinnabar-0.5.2_GH0.tar.gz) = e88ef4e55a06a7cb770c26f679c6f7c182f7986611cbfede1215c42e34f7031c
+SIZE (glandium-git-cinnabar-0.5.2_GH0.tar.gz) = 167168