svn commit: r531815 - in branches/2020Q2/devel/git-cinnabar: . files

[Jan Beich]

Author: jbeich
Date: Thu Apr 16 03:05:48 2020
New Revision: 531815
URL: https://svnweb.freebsd.org/changeset/ports/531815

Log:
  MFH: r531625 r531733
  
  devel/git-cinnabar: unbreak after r531622
  
  ../helper/cinnabar-helper.c:195:41: error: too few arguments to function call, expected 5, have 4
          st = open_istream(oid, &type, &sz, NULL);
               ~~~~~~~~~~~~                      ^
  ./streaming.h:11:1: note: 'open_istream' declared here
  struct git_istream *open_istream(struct repository *, const struct object_id *,
  ^
  
  Obtained from:	upstream
  Approved by:	ports-secteam blanket

Added:
  branches/2020Q2/devel/git-cinnabar/files/patch-git-2.26
     - copied unchanged from r531625, head/devel/git-cinnabar/files/patch-git-2.26
Modified:
  branches/2020Q2/devel/git-cinnabar/Makefile
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/devel/git-cinnabar/Makefile
==============================================================================
--- branches/2020Q2/devel/git-cinnabar/Makefile	Thu Apr 16 03:01:14 2020	(r531814)
+++ branches/2020Q2/devel/git-cinnabar/Makefile	Thu Apr 16 03:05:48 2020	(r531815)
@@ -2,7 +2,7 @@
 
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.5.4
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich at FreeBSD.org

Copied: branches/2020Q2/devel/git-cinnabar/files/patch-git-2.26 (from r531625, head/devel/git-cinnabar/files/patch-git-2.26)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/devel/git-cinnabar/files/patch-git-2.26	Thu Apr 16 03:05:48 2020	(r531815, copy of r531625, head/devel/git-cinnabar/files/patch-git-2.26)
@@ -0,0 +1,29 @@
+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);