svn commit: r453290 - head/devel/git-cinnabar

Jan Beich jbeich at FreeBSD.org
Wed Nov 1 15:08:39 UTC 2017


Author: jbeich
Date: Wed Nov  1 15:08:37 2017
New Revision: 453290
URL: https://svnweb.freebsd.org/changeset/ports/453290

Log:
  devel/git-cinnabar: mark BROKEN after r453269
  
  Hmm...  Looks like a unified diff to me...
  The text leading up to this was:
  --------------------------
  |diff --git a/sha1_file.c b/sha1_file.c
  |index 9c86d1924..7a1b277c8 100644
  |--- a/sha1_file.c
  |+++ b/sha1_file.c
  --------------------------
  Hunk #2 succeeded at 2314 (offset 6 lines).
  Patching file /usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.0b2/git-core/sha1_file.c using Plan A...
  No such line 2615 in input file, ignoring
  done
  Hunk #1 failed at 2616.
  1 out of 1 hunks failed--saving rejects to helper/sha1_file.patched.c.rej
  ../helper/cinnabar-fast-import.c:139:13: error: passing 'struct mru' to parameter of incompatible
        type 'struct mru *'; take the address with &
          mru_append(packed_git_mru, pack_data);
                     ^~~~~~~~~~~~~~
                     &
  ./mru.h:41:29: note: passing argument to parameter 'mru' here
  void mru_append(struct mru *mru, void *item);
  ../helper/hg-connect.c:270:50: error: too many arguments to function call, expected 2, have 3
          mks_tempfile_ts(tmpfile, "hg-bundle-XXXXXX.hg", 3);
          ~~~~~~~~~~~~~~~                                 ^
  ./tempfile.h:165:1: note: 'mks_tempfile_ts' declared here
  static inline struct tempfile *mks_tempfile_ts(const char *template,
  ^
  ../helper/hg-connect.c:273:2: warning: implicit declaration of function 'close_tempfile' is invalid
        in C99 [-Wimplicit-function-declaration]
          close_tempfile(tmpfile);
          ^
  ../helper/hg-connect.c:281:18: warning: incompatible pointer types passing 'struct tempfile *' to
        parameter of type 'struct tempfile **'; take the address with & [-Wincompatible-pointer-types]
          delete_tempfile(tmpfile);
                          ^~~~~~~
                          &
  ./tempfile.h:251:47: note: passing argument to parameter 'tempfile_p' here
  extern void delete_tempfile(struct tempfile **tempfile_p);
                                                ^
  ../helper/cinnabar-helper.c:216:6: warning: implicit declaration of function 'get_sha1' is invalid in
        C99 [-Wimplicit-function-declaration]
          if (get_sha1(args->items[0].string, sha1))
              ^
  ../helper/cinnabar-helper.c:428:6: warning: implicit declaration of function 'get_sha1_committish' is
        invalid in C99 [-Wimplicit-function-declaration]
          if (get_sha1_committish(args->items[0].string, sha1))
              ^
  ../helper/cinnabar-helper.c:982:7: warning: logical not is only applied to the left hand side of this
        bitwise operator [-Wlogical-not-parentheses]
                  if (!obj->flags & SEEN)
                      ^           ~
  ../helper/cinnabar-helper.c:982:7: note: add parentheses after the '!' to evaluate the bitwise
        operator first
                  if (!obj->flags & SEEN)
                      ^
                       (                )
  ../helper/cinnabar-helper.c:982:7: note: add parentheses around left hand side expression to silence
        this warning
                  if (!obj->flags & SEEN)
                      ^
                      (          )
  ../helper/cinnabar-helper.c:1517:52: error: no member named 'size' in 'struct oidmap'
                  display_progress(track->progress, track->set.map.size);
                                                    ~~~~~~~~~~~~~~ ^

Modified:
  head/devel/git-cinnabar/Makefile   (contents, props changed)

Modified: head/devel/git-cinnabar/Makefile
==============================================================================
--- head/devel/git-cinnabar/Makefile	Wed Nov  1 14:35:47 2017	(r453289)
+++ head/devel/git-cinnabar/Makefile	Wed Nov  1 15:08:37 2017	(r453290)
@@ -10,6 +10,8 @@ COMMENT=	Git remote helper to interact with Mercurial 
 
 LICENSE=	GPLv2
 
+BROKEN=		fails to build against git-2.15.*
+
 BUILD_DEPENDS=	${NONEXISTENT}:devel/git:configure
 RUN_DEPENDS=	git:devel/git \
 		hg:devel/mercurial


More information about the svn-ports-all mailing list