kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

devel/git-cinnabar: unbreak after r433740 / 70558fc7a7

Browse source 
../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)
This commit is contained in:
Jan Beich 2017-02-09 16:37:01 +00:00
parent dc0ed96b23
commit fa190183cc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=433742
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
devel/git-cinnabar/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= git-cinnabar
DISTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= jbeich@FreeBSD.org

14
devel/git-cinnabar/files/patch-cinnabar-fast-import.c Normal file
View file

@ -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*));