15:25 jbeich 

devel/git-cinnabar: unbreak after r537899

helper/cinnabar-fast-import.c:12:10: fatal error:
      'sha1-array.h' file not found
 #include "sha1-array.h"
          ^~~~~~~~~~~~~~
In file included from helper/hg-connect-stdio.c:3:
In file included from helper/hg-connect-internal.h:4:
helper/hg-connect.h:6:10: fatal error: 'sha1-array.h' file not
      found
 #include "sha1-array.h"
          ^~~~~~~~~~~~~~

Obtained from:	upstream

 

08:32 jbeich 

devel/git-cinnabar: update to 0.5.5

Changes:	https://github.com/glandium/git-cinnabar/releases/tag/0.5.5
Reported by:	GitHub (watch releases)

 

11:18 jbeich 

devel/git-cinnabar: rebuild and unbreak after r528780

|diff --git a/notes.c b/notes.c
|index 75c028b300..24089afa8a 100644
|--- a/notes.c
|+++ b/notes.c
--------------------------
Patching file
/wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/notes.c
using Plan A...
Hunk #1 succeeded at 419 (offset 2 lines).
Hunk #2 failed at 721.
Hunk #3 succeeded at 752 (offset 3 lines).
Hunk #4 succeeded at 1159 (offset 35 lines).
Hunk #5 failed at 1177.
Hunk #6 succeeded at 1159 (offset 4 lines).
2 out of 6 hunks failed--saving rejects to helper/notes.patched.c.rej
done
gmake[2]: *** [Makefile:157: ../helper/notes.patched.c] Error 1

Reported by:	pkg-fallout

 

06:48 jbeich 

devel/git-cinnabar: update to 0.5.3

Changes:	https://github.com/glandium/git-cinnabar/releases/tag/0.5.3
Changes:	https://github.com/glandium/git-cinnabar/compare/0.5.2...0.5.3
Reported by:	GitHub (watch releases)

 

20:29 jbeich 

devel/git-cinnabar: rebuild and unbreak after r509301

../helper/cinnabar-fast-import.c:250:51: error: too few arguments to function
call, expected 5, have 4
                        if (!get_tree_entry(note, path, &git_oid, &mode))
                             ~~~~~~~~~~~~~~                            ^
./tree-walk.h:71:1: note: 'get_tree_entry' declared here
int get_tree_entry(struct repository *, const struct object_id *, const char *,
struct object_id *, unsign...
^

 

08:20 jbeich 

devel/git-cinnabar: update to 0.5.2

Changes:	https://github.com/glandium/git-cinnabar/releases/tag/0.5.2
Changes:	https://github.com/glandium/git-cinnabar/compare/0.5.1...0.5.2
Reported by:	GitHub (watch releases)

 

19:29 jbeich 

devel/git: update to 2.22.0

Changes:	https://lkml.org/lkml/2019/6/7/1177
Changes:	https://github.blog/2019-06-07-highlights-from-git-2-22/
PR:		238442
Approved by:	garga (maintainer)

 

16:38 jbeich 

devel/git-cinnabar: update to 0.5.0.54

Changes:	https://github.com/glandium/git-cinnabar/compare/0236515...1cdd557

 

14:24 jbeich 

devel/git-cinnabar: rebuild and unbreak after r493857

API bustage was caused by:
https://github.com/git/git/commit/a3b72c89bdd1
https://github.com/git/git/commit/e092073d643b
https://github.com/git/git/commit/ea82b2a0857e

 

00:02 jbeich 

devel/git-cinnabar: update to 0.5.0.36 (nop)

Changes:	https://github.com/glandium/git-cinnabar/compare/cb81a59...0236515

 

17:30 jbeich 

devel/git-cinnabar: rebuild and unbreak after r487197

./helper/cinnabar-helper.c:1464:49: error: no member named 'map' in 'struct
oidset'
                                 hashmap_get_size(&track->set.map.map));
                                                   ~~~~~~~~~~ ^
./helper/cinnabar-helper.c:1712:34: warning: incompatible pointer types passing
'size_t *' (aka 'unsigned int *') to parameter of type 'unsigned long *'
[-Wincompatible-pointer-types]
        buf = get_commit_buffer(commit, &size);
                                        ^~~~~
./commit.h:112:69: note: passing argument to parameter 'size' here
const void *get_commit_buffer(const struct commit *, unsigned long *size);
                                                                    ^

Reported by:	pkg-fallout

 

12:01 jbeich 

devel/git-cinnabar: update to 0.5.0.b2.9

Changes:	https://github.com/glandium/git-cinnabar/compare/0.5.0b2...83b5d99

 

05:07 jbeich 

devel/git-cinnabar: unbreak

 

12:39 jbeich 

devel/git-cinnabar: update to 0.4.0.5

Changes:	https://github.com/glandium/git-cinnabar/compare/0.4.0...cd0e1bb
MFH:		2017Q1 (requires r433742 to chase r436592)

 

16:37 jbeich 

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)