svn commit: r433742 - in head/devel/git-cinnabar: . files

[Jan Beich]

Author: jbeich
Date: Thu Feb  9 16:37:01 2017
New Revision: 433742
URL: https://svnweb.freebsd.org/changeset/ports/433742

Log:
  devel/git-cinnabar: unbreak after r433740 / 70558fc7a7b0
  
  ../cinnabar-fast-import.c:86:7: error: use of undeclared identifier 'pack_compression_seen'; did you
        mean 'pack_compression_level'?
          if (!pack_compression_seen && core_compression_seen)
               ^~~~~~~~~~~~~~~~~~~~~
               pack_compression_level
  ./cache.h:705:12: note: 'pack_compression_level' declared here
  extern int pack_compression_level;
             ^
  ../cinnabar-fast-import.c:86:32: error: use of undeclared identifier 'core_compression_seen'; did you
        mean 'core_compression_level'?
          if (!pack_compression_seen && core_compression_seen)
                                        ^~~~~~~~~~~~~~~~~~~~~
                                        core_compression_level
  ./cache.h:704:12: note: 'core_compression_level' declared here
  extern int core_compression_level;
             ^
  
  Ping to:	@glandium (upstream)

Added:
  head/devel/git-cinnabar/files/
  head/devel/git-cinnabar/files/patch-cinnabar-fast-import.c   (contents, props changed)
Modified:
  head/devel/git-cinnabar/Makefile   (contents, props changed)

Modified: head/devel/git-cinnabar/Makefile
==============================================================================
--- head/devel/git-cinnabar/Makefile	Thu Feb  9 16:34:05 2017	(r433741)
+++ head/devel/git-cinnabar/Makefile	Thu Feb  9 16:37:01 2017	(r433742)
@@ -2,6 +2,7 @@
 
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich at FreeBSD.org

Added: head/devel/git-cinnabar/files/patch-cinnabar-fast-import.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/git-cinnabar/files/patch-cinnabar-fast-import.c	Thu Feb  9 16:37:01 2017	(r433742)
@@ -0,0 +1,14 @@
+Chase https://github.com/git/git/commit/8de7eeb54b6a
+
+--- cinnabar-fast-import.c.orig	2017-01-18 08:05:01 UTC
++++ cinnabar-fast-import.c
+@@ -83,9 +83,6 @@ static void init()
+ 	git_pack_config();
+ 	ignore_case = 0;
+ 
+-	if (!pack_compression_seen && core_compression_seen)
+-		pack_compression_level = core_compression_level;
+-
+ 	alloc_objects(object_entry_alloc);
+ 	strbuf_init(&command_buf, 0);
+ 	atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));